diff --git a/src/mat2.rs b/src/mat2.rs
index aaf1384..84bbef7 100644
--- a/src/mat2.rs
+++ b/src/mat2.rs
@@ -380,10 +380,10 @@ impl<T:Copy + Float + FuzzyEq<T> + Add<T,T> + Sub<T,T> + Mul<T,T> + Div<T,T> + N
 
 impl<T:Copy> Index<uint, Vec2<T>> for Mat2<T> {
     #[inline(always)]
-    fn index(&self, i: uint) -> Vec2<T> {
+    fn index(&self, i: &uint) -> Vec2<T> {
         unsafe { do buf_as_slice(
             transmute::<*Mat2<T>, *Vec2<T>>(
-                to_unsafe_ptr(self)), 2) |slice| { slice[i] }
+                to_unsafe_ptr(self)), 2) |slice| { slice[*i] }
         }
     }
 }
diff --git a/src/mat3.rs b/src/mat3.rs
index 67cf467..b8dad31 100644
--- a/src/mat3.rs
+++ b/src/mat3.rs
@@ -558,10 +558,10 @@ impl<T:Copy + Float + FuzzyEq<T> + Add<T,T> + Sub<T,T> + Mul<T,T> + Div<T,T> + N
 
 impl<T:Copy> Index<uint, Vec3<T>> for Mat3<T> {
     #[inline(always)]
-    fn index(&self, i: uint) -> Vec3<T> {
+    fn index(&self, i: &uint) -> Vec3<T> {
         unsafe { do buf_as_slice(
             transmute::<*Mat3<T>, *Vec3<T>>(
-                to_unsafe_ptr(self)), 3) |slice| { slice[i] }
+                to_unsafe_ptr(self)), 3) |slice| { slice[*i] }
         }
     }
 }
diff --git a/src/mat4.rs b/src/mat4.rs
index 5f3c16a..7d549f5 100644
--- a/src/mat4.rs
+++ b/src/mat4.rs
@@ -501,10 +501,10 @@ impl<T:Copy + Float + FuzzyEq<T> + Add<T,T> + Sub<T,T> + Mul<T,T> + Div<T,T> + N
 
 impl<T:Copy> Index<uint, Vec4<T>> for Mat4<T> {
     #[inline(always)]
-    fn index(&self, i: uint) -> Vec4<T> {
+    fn index(&self, i: &uint) -> Vec4<T> {
         unsafe { do buf_as_slice(
             transmute::<*Mat4<T>, *Vec4<T>>(
-                to_unsafe_ptr(self)), 4) |slice| { slice[i] }
+                to_unsafe_ptr(self)), 4) |slice| { slice[*i] }
         }
     }
 }
diff --git a/src/quat.rs b/src/quat.rs
index 5ce31e4..ac9c95d 100644
--- a/src/quat.rs
+++ b/src/quat.rs
@@ -392,10 +392,10 @@ impl<T:Copy + Float + FuzzyEq<T> + Add<T,T> + Sub<T,T> + Mul<T,T> + Div<T,T> + N
 
 impl<T:Copy> Index<uint, T> for Quat<T> {
     #[inline(always)]
-    fn index(&self, i: uint) -> T {
+    fn index(&self, i: &uint) -> T {
         unsafe { do buf_as_slice(
             transmute::<*Quat<T>, *T>(
-                to_unsafe_ptr(self)), 4) |slice| { slice[i] }
+                to_unsafe_ptr(self)), 4) |slice| { slice[*i] }
         }
     }
 }
diff --git a/src/test/performance/matrix_mul.rs b/src/test/performance/matrix_mul.rs
index 7b740a4..99dc2a1 100644
--- a/src/test/performance/matrix_mul.rs
+++ b/src/test/performance/matrix_mul.rs
@@ -99,7 +99,7 @@ pub impl Vec4: Index<uint, float> {
     fn index(i: uint) -> float {
         unsafe { do buf_as_slice(
             transmute::<*Vec4, *float>(
-                to_unsafe_ptr(&self)), 4) |slice| { slice[i] }
+                to_unsafe_ptr(&self)), 4) |slice| { slice[*i] }
         }
     }
 }
@@ -191,7 +191,7 @@ pub impl Mat4: Index<uint, Vec4> {
     fn index(i: uint) -> Vec4 {
         unsafe { do buf_as_slice(
             transmute::<*Mat4, *Vec4>(
-                to_unsafe_ptr(&self)), 4) |slice| { slice[i] }
+                to_unsafe_ptr(&self)), 4) |slice| { slice[*i] }
         }
     }
 }
diff --git a/src/test/performance/vector_index_operator.rs b/src/test/performance/vector_index_operator.rs
index d0960ff..51626a0 100644
--- a/src/test/performance/vector_index_operator.rs
+++ b/src/test/performance/vector_index_operator.rs
@@ -51,7 +51,7 @@ pub impl VecBufSlice: Index<uint, float> {
     fn index(i: uint) -> float unsafe {
         do vec::raw::buf_as_slice(
             transmute::<*VecBufSlice, *float>(
-                to_unsafe_ptr(&self)), 4) |slice| { slice[i] }
+                to_unsafe_ptr(&self)), 4) |slice| { slice[*i] }
     }
 }
 
diff --git a/src/test/performance/vector_map_fold.rs b/src/test/performance/vector_map_fold.rs
index 61d56c6..35d4eb7 100644
--- a/src/test/performance/vector_map_fold.rs
+++ b/src/test/performance/vector_map_fold.rs
@@ -28,7 +28,7 @@ pub impl<T:Copy Num> Vec4<T> {
     fn index(i: uint) -> T {
         unsafe { do buf_as_slice(
             transmute::<*Vec4<T>, *T>(
-                to_unsafe_ptr(&self)), 4) |slice| { slice[i] }
+                to_unsafe_ptr(&self)), 4) |slice| { slice[*i] }
         }
     }
     
diff --git a/src/vec2.rs b/src/vec2.rs
index 3e8ea5f..06f0925 100644
--- a/src/vec2.rs
+++ b/src/vec2.rs
@@ -68,8 +68,8 @@ impl<T> Vector2<T> for Vec2<T> {
 
 impl<T:Copy + Eq> Index<uint, T> for Vec2<T> {
     #[inline(always)]
-    fn index(&self, i: uint) -> T {
-        unsafe { do buf_as_slice(self.to_ptr(), 2) |slice| { slice[i] } }
+    fn index(&self, i: &uint) -> T {
+        unsafe { do buf_as_slice(self.to_ptr(), 2) |slice| { slice[*i] } }
     }
 }
 
diff --git a/src/vec3.rs b/src/vec3.rs
index ecd6cef..a35b1c2 100644
--- a/src/vec3.rs
+++ b/src/vec3.rs
@@ -70,8 +70,8 @@ impl<T> Vector3<T> for Vec3<T> {
 
 impl<T:Copy + Eq> Index<uint, T> for Vec3<T> {
     #[inline(always)]
-    fn index(&self, i: uint) -> T {
-        unsafe { do buf_as_slice(self.to_ptr(), 3) |slice| { slice[i] } }
+    fn index(&self, i: &uint) -> T {
+        unsafe { do buf_as_slice(self.to_ptr(), 3) |slice| { slice[*i] } }
     }
 }
 
diff --git a/src/vec4.rs b/src/vec4.rs
index c7aa91f..7f2496a 100644
--- a/src/vec4.rs
+++ b/src/vec4.rs
@@ -68,8 +68,8 @@ impl<T> Vector4<T> for Vec4<T> {
 
 impl<T:Copy + Eq> Index<uint, T> for Vec4<T> {
     #[inline(always)]
-    fn index(&self, i: uint) -> T {
-        unsafe { do buf_as_slice(self.to_ptr(), 4) |slice| { slice[i] } }
+    fn index(&self, i: &uint) -> T {
+        unsafe { do buf_as_slice(self.to_ptr(), 4) |slice| { slice[*i] } }
     }
 }