diff --git a/src/com/sheepit/client/standalone/Worker.java b/src/com/sheepit/client/standalone/Worker.java
index bded511..a26324c 100644
--- a/src/com/sheepit/client/standalone/Worker.java
+++ b/src/com/sheepit/client/standalone/Worker.java
@@ -186,16 +186,10 @@ public class Worker {
 		}
 		
 		if (method != null) {
-			if (method.equalsIgnoreCase("cpu")) {
-				compute_method = ComputeType.CPU_ONLY;
+			try {
+				compute_method = ComputeType.valueOf(method);
 			}
-			else if (method.equalsIgnoreCase("gpu")) {
-				compute_method = ComputeType.GPU_ONLY;
-			}
-			else if (method.equalsIgnoreCase("cpu_gpu") || method.equalsIgnoreCase("gpu_cpu")) {
-				compute_method = ComputeType.CPU_GPU;
-			}
-			else {
+			catch (IllegalArgumentException e) {
 				System.err.println("Error: compute-method unknown");
 				System.exit(2);
 			}