diff --git a/forge-ai/src/main/java/forge/ai/SpecialCardAi.java b/forge-ai/src/main/java/forge/ai/SpecialCardAi.java
index be7ad6dae96..476fbde124e 100644
--- a/forge-ai/src/main/java/forge/ai/SpecialCardAi.java
+++ b/forge-ai/src/main/java/forge/ai/SpecialCardAi.java
@@ -709,7 +709,8 @@ public class SpecialCardAi {
                 }
             }
 
-            int changeNum = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("ChangeNum"), sa);
+            int changeNum = AbilityUtils.calculateAmount(sa.getHostCard(),
+                    sa.getParamOrDefault("ChangeNum", "1"), sa);
             CardCollection lib = CardLists.filter(ai.getCardsIn(ZoneType.Library),
                     Predicates.not(CardPredicates.nameEquals(sa.getHostCard().getName())));
             Collections.sort(lib, CardLists.CmcComparatorInv);
diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
index 1c689660504..fa364648ec1 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
@@ -387,15 +387,13 @@ public class ChangeZoneAi extends SpellAbilityAi {
                 return false;
             }
 
-            String num = sa.getParam("ChangeNum");
-            if (num != null) {
-                if (num.contains("X") && sa.getSVar("X").equals("Count$xPaid")) {
-                    // Set PayX here to maximum value.
-                    int xPay = ComputerUtilCost.getMaxXValue(sa, ai, sa.isTrigger());
-                    if (xPay == 0) return false;
-                    xPay = Math.min(xPay, list.size());
-                    sa.setXManaCostPaid(xPay);
-                }
+            String num = sa.getParamOrDefault("ChangeNum", "1");
+            if (num.contains("X") && sa.getSVar("X").equals("Count$xPaid")) {
+                // Set PayX here to maximum value.
+                int xPay = ComputerUtilCost.getMaxXValue(sa, ai, sa.isTrigger());
+                if (xPay == 0) return false;
+                xPay = Math.min(xPay, list.size());
+                sa.setXManaCostPaid(xPay);
             }
 
             if (sourceName.equals("Temur Sabertooth")) {