diff --git a/res/cardsfolder/i/instill_furor.txt b/res/cardsfolder/i/instill_furor.txt
index 833d121012e..4d2cdd0d9c8 100644
--- a/res/cardsfolder/i/instill_furor.txt
+++ b/res/cardsfolder/i/instill_furor.txt
@@ -4,7 +4,9 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ At the beginning of your end step, sacrifice this creature unless it attacked this turn. | Description$ Enchanted creature has "At the beginning of your end step, sacrifice this creature unless it attacked this turn."
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ EOTTrigger | AddSVar$ TrigSac | Description$ Enchanted creature has "At the beginning of your end step, sacrifice this creature unless it attacked this turn."
+SVar:EOTTrigger:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ At the beginning of your end step, sacrifice this creature unless it attacked this turn.
+SVar:TrigSac:DB$Sacrifice | Defined$ Self | ConditionPresent$ Card.Self+notAttackedThisTurn | ConditionCompare$ GE1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/instill_furor.jpg
 SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/134.jpg
diff --git a/src/main/java/forge/EndOfTurn.java b/src/main/java/forge/EndOfTurn.java
index 79976c326c5..35fb8410aa4 100644
--- a/src/main/java/forge/EndOfTurn.java
+++ b/src/main/java/forge/EndOfTurn.java
@@ -254,19 +254,6 @@ public class EndOfTurn implements java.io.Serializable {
 
         execute(at);
 
-        CardList all2 = AllZoneUtil.getCardsIn(Zone.Battlefield);
-        for (Card c : all2) {
-            c.clearMustBlockCards();
-            if(AllZone.getPhase().isPlayerTurn(AllZone.getComputerPlayer())) {
-                c.setCreatureAttackedLastComputerTurn(c.getCreatureAttackedThisTurn());
-            }
-            if(AllZone.getPhase().isPlayerTurn(AllZone.getHumanPlayer())) {
-                c.setCreatureAttackedLastHumanTurn(c.getCreatureAttackedThisTurn());
-            }
-            c.setCreatureAttackedThisTurn(false);
-            c.setCreatureBlockedThisTurn(false);
-        }
-
     } // executeAt()
 
     /**
diff --git a/src/main/java/forge/Phase.java b/src/main/java/forge/Phase.java
index bbe7884868e..bd7acaccd98 100644
--- a/src/main/java/forge/Phase.java
+++ b/src/main/java/forge/Phase.java
@@ -381,6 +381,15 @@ public class Phase extends MyObservable implements java.io.Serializable {
                 c.setDealtDmgToHumanThisTurn(false);
                 c.setDealtDmgToComputerThisTurn(false);
                 c.setRegeneratedThisTurn(0);
+                c.clearMustBlockCards();
+                if(AllZone.getPhase().isPlayerTurn(AllZone.getComputerPlayer())) {
+                    c.setCreatureAttackedLastComputerTurn(c.getCreatureAttackedThisTurn());
+                }
+                if(AllZone.getPhase().isPlayerTurn(AllZone.getHumanPlayer())) {
+                    c.setCreatureAttackedLastHumanTurn(c.getCreatureAttackedThisTurn());
+                }
+                c.setCreatureAttackedThisTurn(false);
+                c.setCreatureBlockedThisTurn(false);
             }
             AllZone.getHumanPlayer().resetPreventNextDamage();
             AllZone.getComputerPlayer().resetPreventNextDamage();