diff --git a/src/engine/wpakpowers/WpakPowerManager.java b/src/engine/wpakpowers/WpakPowerManager.java
index cb1442c3..77309473 100644
--- a/src/engine/wpakpowers/WpakPowerManager.java
+++ b/src/engine/wpakpowers/WpakPowerManager.java
@@ -399,23 +399,13 @@ public class WpakPowerManager {
     }
 
     public static boolean allowedInCombat(Power power) {
-        switch (power.castingMode.name()) {
-            case "NONE":
-            case "BOTH":
-            case "COMBAT":
-                return true;
-        }
-        return false;
+        return power.castingMode.equals(mbEnums.CastingModeType.NONCOMBAT) == false;
     }
 
     public static boolean allowedOutOfCombat(Power power) {
-        switch (power.castingMode.name()) {
-            case "NONE":
-            case "BOTH":
-            case "NONCOMBAT":
-                return true;
-        }
-        return false;
+
+        return power.castingMode.equals(mbEnums.CastingModeType.COMBAT) == false;
+
     }
 
     public static Pair<Float, Float> getModifierValues(ModifierEntry modifierEntry, int rank) {