diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
index 90a6858406d..a3d10a0cf1f 100644
--- a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
+++ b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
@@ -407,7 +407,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
         boolean optional = sa.hasParam("Optional");
 
 
-        for (Card tgtC : tgtCards) {
+        for (final Card tgtC : tgtCards) {
             if (tgt != null && tgtC.isInPlay() && !tgtC.canBeTargetedBy(sa)) {
                 continue;
             }
@@ -419,7 +419,6 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             if (optional && false == player.getController().confirmAction(sa, null, prompt) )
                 continue;
 
-            tgtC = game.getCardState(tgtC);
             final Zone originZone = game.getZoneOf(tgtC);
 
             // if Target isn't in the expected Zone, continue
diff --git a/src/main/java/forge/card/ability/effects/SacrificeEffect.java b/src/main/java/forge/card/ability/effects/SacrificeEffect.java
index 033ba3e4bba..23ea6a91872 100644
--- a/src/main/java/forge/card/ability/effects/SacrificeEffect.java
+++ b/src/main/java/forge/card/ability/effects/SacrificeEffect.java
@@ -22,7 +22,7 @@ public class SacrificeEffect extends SpellAbilityEffect {
     public void resolve(SpellAbility sa) {
         final Player activator = sa.getActivatingPlayer();
         final Game game = activator.getGame();
-        final Card card = game.getCardState(sa.getSourceCard());
+        final Card card = sa.getSourceCard();
 
         // Expand Sacrifice keyword here depending on what we need out of it.
         final String num = sa.hasParam("Amount") ? sa.getParam("Amount") : "1";