diff --git a/res/cardsfolder/a/apprentice_necromancer.txt b/res/cardsfolder/a/apprentice_necromancer.txt
index 9ca9ce95d30..db5636f7204 100644
--- a/res/cardsfolder/a/apprentice_necromancer.txt
+++ b/res/cardsfolder/a/apprentice_necromancer.txt
@@ -2,7 +2,7 @@ Name:Apprentice Necromancer
 ManaCost:1 B
 Types:Creature Zombie Wizard
 PT:1/1
-A:AB$ ChangeZone | Cost$ B T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ DBPump | SpellDescription$ Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
+A:AB$ ChangeZone | Cost$ B T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ DBPump | AILogic$ BeforeCombat | SpellDescription$ Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
 SVar:DBPump:DB$ Pump | KW$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Targeted | Permanent$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/apprentice_necromancer.jpg
diff --git a/res/cardsfolder/f/footsteps_of_the_goryo.txt b/res/cardsfolder/f/footsteps_of_the_goryo.txt
index 3e3e0c6eb35..213ff11c4c7 100644
--- a/res/cardsfolder/f/footsteps_of_the_goryo.txt
+++ b/res/cardsfolder/f/footsteps_of_the_goryo.txt
@@ -1,7 +1,7 @@
 Name:Footsteps of the Goryo
 ManaCost:2 B
 Types:Sorcery Arcane
-A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ DBPump | SpellDescription$ Return target creature card from your graveyard to the battlefield. Sacrifice that creature at the beginning of the next end step.
+A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ DBPump | AILogic$ BeforeCombat | SpellDescription$ Return target creature card from your graveyard to the battlefield. Sacrifice that creature at the beginning of the next end step.
 SVar:DBPump:DB$Pump | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Targeted | Permanent$ True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/footsteps_of_the_goryo.jpg
diff --git a/res/cardsfolder/g/goryos_vengeance.txt b/res/cardsfolder/g/goryos_vengeance.txt
index d6655032dcb..eb92bdcb727 100644
--- a/res/cardsfolder/g/goryos_vengeance.txt
+++ b/res/cardsfolder/g/goryos_vengeance.txt
@@ -1,7 +1,7 @@
 Name:Goryo's Vengeance
 ManaCost:1 B
 Types:Instant Arcane
-A:SP$ ChangeZone | Cost$ 1 B  | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.Legendary+YouCtrl | TgtPrompt$ Select target legendary creature in your graveyard | GainControl$ True | SubAbility$ DBPump | SpellDescription$ Return target legendary creature card from your graveyard to the battlefield. That creature gains haste. Exile it at the beginning of the next end step.
+A:SP$ ChangeZone | Cost$ 1 B  | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.Legendary+YouCtrl | TgtPrompt$ Select target legendary creature in your graveyard | GainControl$ True | SubAbility$ DBPump | AILogic$ BeforeCombat | SpellDescription$ Return target legendary creature card from your graveyard to the battlefield. That creature gains haste. Exile it at the beginning of the next end step.
 SVar:DBPump:DB$Pump | KW$ Haste & HIDDEN At the beginning of the end step, exile CARDNAME. | Defined$ Targeted | Permanent$ True
 K:Splice onto Arcane 2 B
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/p/postmortem_lunge.txt b/res/cardsfolder/p/postmortem_lunge.txt
index 42a8768cc6f..b4fba21117f 100644
--- a/res/cardsfolder/p/postmortem_lunge.txt
+++ b/res/cardsfolder/p/postmortem_lunge.txt
@@ -1,7 +1,7 @@
 Name:Postmortem Lunge
 ManaCost:X PB
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ X PB | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPromp$ Choose target creature with CMC equal to X. | References$ X | SubAbility$ DBPump | SpellDescription$ Return target creature card with converted mana cost X from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step.
+A:SP$ ChangeZone | Cost$ X PB | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPromp$ Choose target creature with CMC equal to X. | References$ X | SubAbility$ DBPump | AILogic$ BeforeCombat | SpellDescription$ Return target creature card with converted mana cost X from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step.
 SVar:DBPump:DB$Pump | Defined$ Targeted | KW$ Haste & HIDDEN At the beginning of the end step, exile CARDNAME. | Permanent$ True
 SVar:X:Targeted$CardManaCost
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/s/sneak_attack.txt b/res/cardsfolder/s/sneak_attack.txt
index 9608a3c23fe..fa67aaeffd2 100644
--- a/res/cardsfolder/s/sneak_attack.txt
+++ b/res/cardsfolder/s/sneak_attack.txt
@@ -1,7 +1,7 @@
 Name:Sneak Attack
 ManaCost:3 R
 Types:Enchantment
-A:AB$ ChangeZone | Cost$ R | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.YouCtrl | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | SpellDescription$ You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice the creature at the beginning of the next end step.
+A:AB$ ChangeZone | Cost$ R | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.YouCtrl | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | AILogic$ BeforeCombat | SpellDescription$ You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice the creature at the beginning of the next end step.
 SVar:DBPump:DB$ Pump | KW$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Remembered | Permanent$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:NonStackingEffect:True
diff --git a/res/cardsfolder/t/through_the_breach.txt b/res/cardsfolder/t/through_the_breach.txt
index fddcc619e04..f60a99c1dc0 100644
--- a/res/cardsfolder/t/through_the_breach.txt
+++ b/res/cardsfolder/t/through_the_breach.txt
@@ -1,7 +1,7 @@
 Name:Through the Breach
 ManaCost:4 R
 Types:Instant Arcane
-A:SP$ ChangeZone | Cost$ 4 R | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.YouCtrl | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | SpellDescription$ You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice that creature at the beginning of the next end step.
+A:SP$ ChangeZone | Cost$ 4 R | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.YouCtrl | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | AILogic$ BeforeCombat | SpellDescription$ You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice that creature at the beginning of the next end step.
 SVar:DBPump:DB$ Pump | KW$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Remembered | Permanent$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 K:Splice onto Arcane 2 R R
diff --git a/res/cardsfolder/w/whip_of_erebos.txt b/res/cardsfolder/w/whip_of_erebos.txt
index 0f0b990692d..6cdc437514a 100644
--- a/res/cardsfolder/w/whip_of_erebos.txt
+++ b/res/cardsfolder/w/whip_of_erebos.txt
@@ -2,7 +2,7 @@ Name:Whip of Erebos
 ManaCost:2 B B
 Types:Legendary Enchantment Artifact
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ Lifelink | Description$ Creatures you control have lifelink.
-A:AB$ ChangeZone | Cost$ 2 B B T | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature you control to return | Origin$ Graveyard | Destination$ Battlefield | SorcerySpeed$ True | SubAbility$ DBUnearthed | SpellDescription$ Return target creature card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step. If it would leave the battlefield, exile it instead of putting it anywhere else. Activate this ability only any time you could cast a sorcery.
+A:AB$ ChangeZone | Cost$ 2 B B T | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature you control to return | Origin$ Graveyard | Destination$ Battlefield | SorcerySpeed$ True | SubAbility$ DBUnearthed | AILogic$ BeforeCombat | SpellDescription$ Return target creature card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step. If it would leave the battlefield, exile it instead of putting it anywhere else. Activate this ability only any time you could cast a sorcery.
 SVar:DBUnearthed:DB$ Pump | Defined$ ParentTarget | KW$ Haste & HIDDEN If CARDNAME would leave the battlefield, exile it instead of putting it anywhere else. | Permanent$ True | SubAbility$ DBTrueDeath | StackDescription$ It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield.
 SVar:DBTrueDeath:DB$ Effect | RememberObjects$ ParentTarget | Triggers$ DelayTrigWhip | SVars$ DBUnavailable,RemoveSelf
 SVar:DelayTrigWhip:Mode$ Phase | Phase$ End of Turn | Execute$ DBUnavailable | TriggerDescription$ Exile that card at the beginning of the next end step.
diff --git a/res/cardsfolder/z/zirilan_of_the_claw.txt b/res/cardsfolder/z/zirilan_of_the_claw.txt
index 3274484dd59..85ed06de7d4 100644
--- a/res/cardsfolder/z/zirilan_of_the_claw.txt
+++ b/res/cardsfolder/z/zirilan_of_the_claw.txt
@@ -2,7 +2,7 @@ Name:Zirilan of the Claw
 ManaCost:3 R R
 Types:Legendary Creature Viashino Shaman
 PT:3/4
-A:AB$ ChangeZone | Cost$ 1 R R T | Origin$ Library | Destination$ Battlefield | ChangeType$ Dragon | ChangeNum$ 1 | Shuffle$ True | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | SpellDescription$ Search your library for a Dragon permanent card and put that card onto the battlefield. Then shuffle your library. That Dragon gains haste until end of turn. Exile it at the beginning of the next end step.
+A:AB$ ChangeZone | Cost$ 1 R R T | Origin$ Library | Destination$ Battlefield | ChangeType$ Dragon | ChangeNum$ 1 | Shuffle$ True | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | AILogic$ BeforeCombat | SpellDescription$ Search your library for a Dragon permanent card and put that card onto the battlefield. Then shuffle your library. That Dragon gains haste until end of turn. Exile it at the beginning of the next end step.
 SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Haste | SubAbility$ DBDelTrig
 SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigExile
 SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBCleanup
diff --git a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
index ff5ff4594df..0e84c3e8ea3 100644
--- a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
+++ b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
@@ -69,6 +69,10 @@ public class ChangeZoneAi extends SpellAbilityAi {
         if (sa.hasParam("AILogic")) {
             if (sa.getParam("AILogic").equals("Always")) {
                 return true;
+            } else if (sa.getParam("AILogic").equals("BeforeCombat")) {
+                if (aiPlayer.getGame().getPhaseHandler().getPhase().isAfter(PhaseType.COMBAT_BEGIN)) {
+                    return false;
+                }
             }
         }