diff --git a/src/main/java/com/aparapi/device/OpenCLDevice.java b/src/main/java/com/aparapi/device/OpenCLDevice.java
index 823f82e35886e70061eed666d40eda726935c72a..56cd1760ce081b386999ab09d6747c22905638f2 100644
--- a/src/main/java/com/aparapi/device/OpenCLDevice.java
+++ b/src/main/java/com/aparapi/device/OpenCLDevice.java
@@ -142,11 +142,10 @@ public class OpenCLDevice extends Device implements Comparable<Device> {
    * detection.
    */
   public void configure() {
-	  if (configurator != null && !underConfiguration.get()) {
-		 if (underConfiguration.compareAndSet(false, true)) {
-			 configurator.configure(this);
-			 underConfiguration.set(false);
-		 }
+	  if (configurator != null && !underConfiguration.get() &&
+			  underConfiguration.compareAndSet(false, true)) {
+		 configurator.configure(this);
+		 underConfiguration.set(false);
 	  }
   }