diff --git a/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelManager.java b/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelManager.java
index 2b5dc2e2af3474649d22b192fdc662e7a0088d86..2bfaaa8b97dabbd176ae1c8cdf2d698b0e490f39 100644
--- a/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelManager.java
+++ b/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelManager.java
@@ -190,7 +190,7 @@ public class KernelManager {
                devices.addAll(gpus);
                break;
             case CPU:
-               devices.add(cpus.get(0));
+               devices.addAll(cpus);
                break;
             case JTP:
                devices.add(JavaDevice.THREAD_POOL);