diff --git a/Mage.Sets/src/mage/cards/s/SupremeLeaderSnoke.java b/Mage.Sets/src/mage/cards/s/SupremeLeaderSnoke.java
index e8eb5c303de..57b614ce63b 100644
--- a/Mage.Sets/src/mage/cards/s/SupremeLeaderSnoke.java
+++ b/Mage.Sets/src/mage/cards/s/SupremeLeaderSnoke.java
@@ -1,7 +1,5 @@
 package mage.cards.s;
 
-import java.util.UUID;
-
 import mage.abilities.Ability;
 import mage.abilities.LoyaltyAbility;
 import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility;
@@ -32,6 +30,8 @@ import mage.target.common.TargetCreaturePermanent;
 import mage.target.targetadjustment.TargetAdjuster;
 import mage.watchers.common.PlayerLostLifeNonCombatWatcher;
 
+import java.util.UUID;
+
 /**
  * @author NinthWorld
  */
@@ -97,7 +97,7 @@ class OpponentNoncombatLostLifeCount implements DynamicValue {
     @Override
     public int calculate(Game game, Ability sourceAbility, Effect effect) {
         PlayerLostLifeNonCombatWatcher watcher = game.getState().getWatcher(PlayerLostLifeNonCombatWatcher.class);
-        if(watcher != null) {
+        if (watcher != null) {
             return watcher.getAllOppLifeLost(sourceAbility.getControllerId(), game);
         }
         return 0;
@@ -126,7 +126,7 @@ class SupremeLeaderSnokeCounterEffect extends OneShotEffect {
 
     public SupremeLeaderSnokeCounterEffect(final SupremeLeaderSnokeCounterEffect effect) {
         super(effect);
-        this.counter = effect.counter;
+        this.counter = effect.counter.copy();
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java b/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java
index 43b7d063c85..158a97151ea 100644
--- a/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java
@@ -68,7 +68,7 @@ class EscapesWithEffect extends OneShotEffect {
     private EscapesWithEffect(final EscapesWithEffect effect) {
         super(effect);
         this.counter = effect.counter;
-        this.delayedTriggeredAbility = effect.delayedTriggeredAbility;
+        this.delayedTriggeredAbility = effect.delayedTriggeredAbility.copy();
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java
index 692380cfc24..85df1238c73 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java
@@ -1,4 +1,3 @@
-
 package mage.abilities.effects.common;
 
 import mage.abilities.Ability;
@@ -32,7 +31,7 @@ public class EntersBattlefieldWithXCountersEffect extends OneShotEffect {
 
     public EntersBattlefieldWithXCountersEffect(final EntersBattlefieldWithXCountersEffect effect) {
         super(effect);
-        this.counter = effect.counter;
+        this.counter = effect.counter.copy();
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java
index c0ca0c890e9..b56659f6e2b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java
@@ -12,7 +12,6 @@ import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 
 /**
- *
  * @author weirddan455
  */
 public class ReturnFromGraveyardToBattlefieldWithCounterTargetEffect extends ReturnFromGraveyardToBattlefieldTargetEffect {
@@ -32,7 +31,7 @@ public class ReturnFromGraveyardToBattlefieldWithCounterTargetEffect extends Ret
 
     private ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(final ReturnFromGraveyardToBattlefieldWithCounterTargetEffect effect) {
         super(effect);
-        this.counter = effect.counter;
+        this.counter = effect.counter.copy();
         this.additional = effect.additional;
     }
 
@@ -86,7 +85,7 @@ class AddCounterTargetReplacementEffect extends ReplacementEffectImpl {
 
     private AddCounterTargetReplacementEffect(final AddCounterTargetReplacementEffect effect) {
         super(effect);
-        this.counter = effect.counter;
+        this.counter = effect.counter.copy();
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldWithCounterEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldWithCounterEffect.java
index 290965dc913..6676868722b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldWithCounterEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldWithCounterEffect.java
@@ -11,7 +11,6 @@ import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 
 /**
- *
  * @author weirddan455
  */
 public class ReturnSourceFromGraveyardToBattlefieldWithCounterEffect extends ReturnSourceFromGraveyardToBattlefieldEffect {
@@ -26,7 +25,7 @@ public class ReturnSourceFromGraveyardToBattlefieldWithCounterEffect extends Ret
 
     private ReturnSourceFromGraveyardToBattlefieldWithCounterEffect(final ReturnSourceFromGraveyardToBattlefieldWithCounterEffect effect) {
         super(effect);
-        this.counter = effect.counter;
+        this.counter = effect.counter.copy();
     }
 
     @Override
@@ -77,7 +76,7 @@ class AddCounterSourceReplacementEffect extends ReplacementEffectImpl {
 
     private AddCounterSourceReplacementEffect(final AddCounterSourceReplacementEffect effect) {
         super(effect);
-        this.counter = effect.counter;
+        this.counter = effect.counter.copy();
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java
index a1b8b2c250f..e91877ee6ef 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java
@@ -1,4 +1,3 @@
-
 package mage.abilities.effects.common.counter;
 
 import mage.abilities.Ability;
@@ -37,7 +36,7 @@ public class RemoveCounterTargetEffect extends OneShotEffect {
 
     public RemoveCounterTargetEffect(RemoveCounterTargetEffect effect) {
         super(effect);
-        this.counter = effect.counter == null ? null : effect.counter.copy();
+        this.counter = (effect.counter == null ? null : effect.counter.copy());
     }
 
     @Override