diff --git a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java
index 13c2e2c8682..aeb0a222a2d 100644
--- a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java
+++ b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java
@@ -282,7 +282,7 @@ public class StaticAbilityContinuous {
                 p.setMaxHandSize(max);
             }
 
-            if (params.containsKey("RaiseMaxHandSize") && p.getMaxHandSize() >= 0) {
+            if (params.containsKey("RaiseMaxHandSize") && p.getMaxHandSize() != -1) {
                 String rmhs = params.get("RaiseMaxHandSize");
                 int rmax = rmhs.matches("[0-9][0-9]?") ? Integer.parseInt(rmhs)
                         : AbilityFactory.calculateAmount(hostCard, rmhs, null);
diff --git a/src/main/java/forge/control/input/InputCleanup.java b/src/main/java/forge/control/input/InputCleanup.java
index 9a3d596a4a2..78df3e77608 100644
--- a/src/main/java/forge/control/input/InputCleanup.java
+++ b/src/main/java/forge/control/input/InputCleanup.java
@@ -50,7 +50,7 @@ public class InputCleanup extends Input {
         final int n = active.getCardsIn(ZoneType.Hand).size();
         final int max = active.getMaxHandSize();
         // goes to the next phase
-        if (n <= max || max < 0) {
+        if (n <= max || max == -1) {
             Singletons.getModel().getGame().getPhaseHandler().passPriority();
             return;
         }