diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 2d95b9b0c6d..5d590c9aa30 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -1015,7 +1015,7 @@ public class Card extends GameEntity implements Comparable<Card> {
         setTotalCountersToAdd(addAmount);
 
         if (fireEvents) {
-            final Integer oldValue = counters.get(counterType);
+            final Integer oldValue = getCounters(counterType);
             final Integer newValue = addAmount + (oldValue == null ? 0 : oldValue);
 
             if (!newValue.equals(oldValue)) {
@@ -1083,7 +1083,7 @@ public class Card extends GameEntity implements Comparable<Card> {
 
     @Override
     public final void subtractCounter(final CounterType counterName, final int n) {
-        Integer oldValue = counters.get(counterName);
+        Integer oldValue = getCounters(counterName);
         int newValue = oldValue == null ? 0 : Math.max(oldValue - n, 0);
 
         final int delta = (oldValue == null ? 0 : oldValue) - newValue;
diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index c974e3db367..58be431ae12 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -940,7 +940,7 @@ public class Player extends GameEntity implements Comparable<Player> {
 
     public void setCounters(final CounterType counterType, final Integer num, boolean fireEvents) {
         Integer old = getCounters(counterType);
-        counters.put(counterType, num);
+        setCounters(counterType, num);
         view.updateCounters(this);
         if (fireEvents) {
             getGame().fireEvent(new GameEventPlayerCounters(this, counterType, old, num));