diff --git a/src/base/indexing.rs b/src/base/indexing.rs
index c2bb48ff..2c691bd1 100644
--- a/src/base/indexing.rs
+++ b/src/base/indexing.rs
@@ -589,7 +589,10 @@ where
     where
         S: RawStorageMut<T, R, C>,
     {
-        matrix.data.get_unchecked_linear_mut(self)
+        let nrows = matrix.shape().0;
+        let row = self % nrows;
+        let col = self / nrows;
+        matrix.data.get_unchecked_mut(row, col)
     }
 }