diff --git a/src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs b/src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs
index 1824e595ae..22578217d3 100644
--- a/src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs
+++ b/src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs
@@ -457,25 +457,25 @@ public T? this[long rowIndex]
                     return null;
                 }
                 int arrayIndex = GetArrayContainingRowIndex(rowIndex);
-                rowIndex = rowIndex - arrayIndex * ReadOnlyDataFrameBuffer<T>.MaxCapacity;
-                return Buffers[arrayIndex][(int)rowIndex];
+                var bufferOffset = (int)(rowIndex % ReadOnlyDataFrameBuffer<T>.MaxCapacity);
+                return Buffers[arrayIndex][bufferOffset];
             }
             set
             {
                 int arrayIndex = GetArrayContainingRowIndex(rowIndex);
-                rowIndex = rowIndex - arrayIndex * ReadOnlyDataFrameBuffer<T>.MaxCapacity;
+                var bufferOffset = (int)(rowIndex % ReadOnlyDataFrameBuffer<T>.MaxCapacity);
 
                 Buffers.GetOrCreateMutable(arrayIndex);
                 NullBitMapBuffers.GetOrCreateMutable(arrayIndex);
 
                 if (value.HasValue)
                 {
-                    Buffers[arrayIndex][(int)rowIndex] = value.Value;
+                    Buffers[arrayIndex][bufferOffset] = value.Value;
                     SetValidityBit(rowIndex, true);
                 }
                 else
                 {
-                    Buffers[arrayIndex][(int)rowIndex] = default;
+                    Buffers[arrayIndex][bufferOffset] = default;
                     SetValidityBit(rowIndex, false);
                 }
             }
diff --git a/test/Microsoft.Data.Analysis.Tests/BufferTests.cs b/test/Microsoft.Data.Analysis.Tests/BufferTests.cs
index 16672818db..56c26267fd 100644
--- a/test/Microsoft.Data.Analysis.Tests/BufferTests.cs
+++ b/test/Microsoft.Data.Analysis.Tests/BufferTests.cs
@@ -8,12 +8,27 @@
 using System.Text;
 using Apache.Arrow;
 using Microsoft.ML.TestFramework.Attributes;
+using Newtonsoft.Json.Linq;
 using Xunit;
 
 namespace Microsoft.Data.Analysis.Tests
 {
     public class BufferTests
     {
+        [X64Fact("32-bit doesn't allow to allocate more than 2 Gb")]
+        public void TestGetterAndSetterForColumnsGreaterThanMaxCapacity()
+        {
+            const int MaxCapacityInBytes = 2147483591;
+
+            var length = MaxCapacityInBytes + 5;
+            var column = new PrimitiveDataFrameColumn<byte>("LargeColumn", length);
+            var index = length - 1;
+            column[index] = 33;
+
+            Assert.Equal((byte)33, column[index]);
+            Assert.Null(column[index % MaxCapacityInBytes]);
+        }
+
         [Fact]
         public void TestNullCounts()
         {
@@ -446,7 +461,7 @@ public void TestArrowStringColumnClone()
                 Assert.Null(clone[i]);
         }
 
-        [X64Fact("32-bit dosn't allow to allocate more than 2 Gb")]
+        [X64Fact("32-bit doesn't allow to allocate more than 2 Gb")]
         public void TestAppend_SizeMoreThanMaxBufferCapacity()
         {
             //Check appending value, than can increase buffer size over MaxCapacity (default strategy is to double buffer capacity)
@@ -454,7 +469,7 @@ public void TestAppend_SizeMoreThanMaxBufferCapacity()
             intColumn.Append(10);
         }
 
-        [X64Fact("32-bit dosn't allow to allocate more than 2 Gb")]
+        [X64Fact("32-bit doesn't allow to allocate more than 2 Gb")]
         public void TestAppendMany_SizeMoreThanMaxBufferCapacity()
         {
             const int MaxCapacityInBytes = 2147483591;