diff --git a/OpenCL/src/main/scala/com/thoughtworks/compute/OpenCL.scala b/OpenCL/src/main/scala/com/thoughtworks/compute/OpenCL.scala
index d922ae39..ae8cd960 100644
--- a/OpenCL/src/main/scala/com/thoughtworks/compute/OpenCL.scala
+++ b/OpenCL/src/main/scala/com/thoughtworks/compute/OpenCL.scala
@@ -1216,7 +1216,7 @@ trait OpenCL extends MonadicCloseable[UnitContinuation] with ImplicitsSingleton
       val cl20Properties = (properties.view.flatMap { case (key, value) => Seq(key, value) } ++ Seq(0L)).toArray
       val a = Array(0)
       val commandQueue =
-        clCreateCommandQueueWithProperties(platformId.handle, deviceId.handle, cl20Properties, a)
+        clCreateCommandQueueWithProperties(context, deviceId.handle, cl20Properties, a)
       checkErrorCode(a(0))
       commandQueue
     } else {