diff --git a/src/magic/model/action/DeclareBlockersAction.java b/src/magic/model/action/DeclareBlockersAction.java
index afb5cd468f..0b357ef42c 100644
--- a/src/magic/model/action/DeclareBlockersAction.java
+++ b/src/magic/model/action/DeclareBlockersAction.java
@@ -5,6 +5,7 @@ import magic.model.MagicPermanent;
 import magic.model.MagicPlayer;
 import magic.model.choice.MagicCombatCreature;
 import magic.model.choice.MagicDeclareBlockersResult;
+import magic.model.trigger.MagicTriggerType;
 
 public class DeclareBlockersAction extends MagicAction {
 
@@ -24,6 +25,16 @@ public class DeclareBlockersAction extends MagicAction {
                 for (int index=1;index<creatures.length;index++) {
                     game.doAction(new DeclareBlockerAction(attacker,creatures[index].permanent));
                 }
+
+                if (attacker.isBlocked()) {
+                    game.executeTrigger(MagicTriggerType.WhenBecomesBlocked,attacker);
+                }
+            }
+        }
+
+        for (final MagicPermanent permanent : player.getOpponent().getPermanents()) {
+            if (permanent.isAttacking() && !permanent.isBlocked()) {
+                game.executeTrigger(MagicTriggerType.WhenAttacksUnblocked,permanent);
             }
         }
     }
diff --git a/src/magic/model/phase/MagicDeclareBlockersPhase.java b/src/magic/model/phase/MagicDeclareBlockersPhase.java
index 7a4b709a31..2a8313eb97 100644
--- a/src/magic/model/phase/MagicDeclareBlockersPhase.java
+++ b/src/magic/model/phase/MagicDeclareBlockersPhase.java
@@ -2,7 +2,6 @@ package magic.model.phase;
 
 import magic.model.MagicGame;
 import magic.model.event.MagicDeclareBlockersEvent;
-import magic.model.trigger.MagicTriggerType;
 
 public class MagicDeclareBlockersPhase extends MagicPhase {
 
@@ -20,9 +19,5 @@ public class MagicDeclareBlockersPhase extends MagicPhase {
     public void executeBeginStep(final MagicGame game) {
         game.addEvent(new MagicDeclareBlockersEvent(game.getDefendingPlayer()));
         game.setStep(MagicStep.ActivePlayer);
-        //Activate attacking and unblocked triggers after all actions during DeclareBlockers and Fast Effects
-        game.getAttackingPlayer().getPermanents().stream().filter
-            (permanent -> permanent.isAttacking() && !permanent.isBlocked()).forEach
-            (permanent -> game.executeTrigger(MagicTriggerType.WhenAttacksUnblocked, permanent));
     }
 }