--- numpy/core/src/arrayobject.c.orig	2006-09-05 00:21:14.000000000 -0600
+++ numpy/core/src/arrayobject.c	2006-09-05 00:20:33.000000000 -0600
@@ -561,8 +561,8 @@
                 return ret;
         }
 #if (PY_VERSION_HEX >= 0x02050000)
-	if (PyIndex_Check(op)) {
-		long_value = (longlong) PyNumber_Index(op);
+	if (PyIndex_Check(o)) {
+		long_value = (longlong) PyNumber_Index(o);
 		goto finish;
 	}
 #endif
@@ -2691,7 +2691,7 @@
         }
 
         if (PyInt_Check(op) || PyArray_IsScalar(op, Integer) ||
-            PyLong_Check(op) || PyIndex_Check(index)) {
+            PyLong_Check(op) || PyIndex_Check(op)) {
                 intp value;
                 value = PyArray_PyIntAsIntp(op);
                 if (!PyErr_Occurred()) {