diff --git a/src/magic/model/action/MagicDeclareAttackersAction.java b/src/magic/model/action/MagicDeclareAttackersAction.java
index 27e437bb46..92652bce80 100644
--- a/src/magic/model/action/MagicDeclareAttackersAction.java
+++ b/src/magic/model/action/MagicDeclareAttackersAction.java
@@ -23,7 +23,7 @@ public class MagicDeclareAttackersAction extends MagicAction {
         // 508.1f The active player taps the chosen creatures.
         for (final MagicPermanent attacker : attackers) {
             if (!attacker.hasAbility(MagicAbility.Vigilance)) {
-                game.doAction(new MagicTapAction(attacker, false));
+                game.doAction(new MagicTapAction(attacker, true));
             }
         }        
         // 508.1j Each chosen creature still controlled by the active player becomes an attacking creature.
diff --git a/src/magic/model/action/MagicDestroyAction.java b/src/magic/model/action/MagicDestroyAction.java
index f5e982f661..214328481b 100644
--- a/src/magic/model/action/MagicDestroyAction.java
+++ b/src/magic/model/action/MagicDestroyAction.java
@@ -35,7 +35,7 @@ public class MagicDestroyAction extends MagicAction {
             // Regeneration
             if (destroy && permanent.isRegenerated()) {
                 game.logAppendMessage(permanent.getController(),permanent.getName()+" is regenerated.");
-                game.doAction(new MagicTapAction(permanent,false));
+                game.doAction(new MagicTapAction(permanent,true));
                 game.doAction(new MagicRemoveAllDamageAction(permanent));
                 game.doAction(new MagicRemoveFromCombatAction(permanent));
                 game.doAction(new MagicChangeStateAction(permanent,MagicPermanentState.Regenerated,false));
diff --git a/src/magic/model/action/MagicTapAction.java b/src/magic/model/action/MagicTapAction.java
index bd5aae3142..ca1a490c54 100644
--- a/src/magic/model/action/MagicTapAction.java
+++ b/src/magic/model/action/MagicTapAction.java
@@ -25,8 +25,8 @@ public class MagicTapAction extends MagicAction {
             permanent.setState(MagicPermanentState.Tapped);
             if (hasScore) {
                 setScore(permanent.getController(),ArtificialScoringSystem.getTappedScore(permanent));
+                game.executeTrigger(MagicTriggerType.WhenBecomesTapped,permanent);
             }
-            game.executeTrigger(MagicTriggerType.WhenBecomesTapped,permanent);
             game.setStateCheckRequired();
         }
     }