diff --git a/checkin_notes b/checkin_notes
index a5cd1656ec..7d08a7c235 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1455,3 +1455,9 @@ David  7 Feb 2012
 		client_state.cpp
 		client_types.cpp,h
 		cs_apps.cpp
+
+Charlie 7 Feb 2012
+    - client: Fix bug in setting opencl_device_index.
+
+    client/
+        coproc_detect.cpp
diff --git a/client/coproc_detect.cpp b/client/coproc_detect.cpp
index 93dbb31da6..f3f119a91d 100644
--- a/client/coproc_detect.cpp
+++ b/client/coproc_detect.cpp
@@ -374,7 +374,7 @@ strcpy(prop.opencl_driver_version, "CLH 1.0");
                 (strstr(prop.vendor, "Advanced Micro Devices, Inc."))
             ) {
                 prop.device_num = (int)(ati_opencls.size());
-                prop.opencl_device_index = prop.device_num;
+                prop.opencl_device_index = device_index;
 
 #ifdef __APPLE__
                 // Work around a bug in OpenCL which returns only