diff --git a/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java b/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java
index 210464db7d7..21ed56b4b61 100644
--- a/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java
+++ b/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java
@@ -176,13 +176,7 @@ public class CostRemoveCounter extends CostPart {
         Card source = ability.getHostCard();
 
         int removed = 0;
-        final int toRemove;
-        if (getAmount().equals("All")) {
-            toRemove = source.getCounters(counter);
-        }
-        else {
-            toRemove = AbilityUtils.calculateAmount(source, getAmount(), ability);
-        }
+        final int toRemove = decision.c;
 
         // for this cost, the list should be only one
         for (Card c : decision.cards) {
diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
index baf6bb7a188..22d8f37323a 100644
--- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java
+++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
@@ -1042,7 +1042,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
         int cntRemoved = 1;
         if (c != null) {
             cntRemoved = c.intValue();
-        } else if (!"XChoice".equals(sVarAmount)) {
+        } else if (!"XChoice".equals(sVarAmount) && !amount.equals("All")) {
             cntRemoved = AbilityUtils.calculateAmount(source, amount, ability);
         }