diff --git a/res/cardsfolder/m/mad_dog.txt b/res/cardsfolder/m/mad_dog.txt
index b7ae5540c3b..c3a75a91fc0 100644
--- a/res/cardsfolder/m/mad_dog.txt
+++ b/res/cardsfolder/m/mad_dog.txt
@@ -1,15 +1,16 @@
-Name:Mad Dog
-ManaCost:1 R
-Types:Creature Hound
-Text:no text
-PT:2/2
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ TrigSacrifice | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, if CARDNAME didn't attack or come under your control this turn, sacrifice it.
-SVar:TrigSacrifice:AB$ Sacrifice | Cost$ 0 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
-SVar:Y:Count$ThisTurnEntered_Battlefield_Card.Self
-SVar:Z:Count$Valid Card.Self+attackedThisTurn
-SVar:X:SVar$Y/Plus.Z
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mad_dog.jpg
-SetInfo:ODY|Common|http://magiccards.info/scans/en/od/202.jpg
-Oracle:At the beginning of your end step, if Mad Dog didn't attack or come under your control this turn, sacrifice it.
+Name:Mad Dog
+ManaCost:1 R
+Types:Creature Hound
+Text:no text
+PT:2/2
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ TrigSacrifice | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, if CARDNAME didn't attack or come under your control this turn, sacrifice it.
+SVar:TrigSacrifice:AB$ Sacrifice | Cost$ 0 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
+SVar:Y:Count$ThisTurnEntered_Battlefield_Card.Self
+SVar:Z:Count$Valid Card.Self+attackedThisTurn
+SVar:X:SVar$Y/Plus.Z
+SVar:MustAttack:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mad_dog.jpg
+SetInfo:ODY|Common|http://magiccards.info/scans/en/od/202.jpg
+Oracle:At the beginning of your end step, if Mad Dog didn't attack or come under your control this turn, sacrifice it.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_mentor.txt b/res/cardsfolder/n/nantuko_mentor.txt
index c8a1302ceae..b77ca9044c6 100644
--- a/res/cardsfolder/n/nantuko_mentor.txt
+++ b/res/cardsfolder/n/nantuko_mentor.txt
@@ -1,12 +1,13 @@
-Name:Nantuko Mentor
-ManaCost:2 G
-Types:Creature Insect Druid
-Text:no text
-PT:1/1
-A:AB$ Pump | Cost$ 2 G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | SpellDescription$ Target creature gets +X/+X until end of turn, where X is that creature's power.
-SVar:X:Targeted$CardPower
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_mentor.jpg
-SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/255.jpg
-Oracle:{2}{G}, {T}: Target creature gets +X/+X until end of turn, where X is that creature's power.
+Name:Nantuko Mentor
+ManaCost:2 G
+Types:Creature Insect Druid
+Text:no text
+PT:1/1
+A:AB$ Pump | Cost$ 2 G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | SpellDescription$ Target creature gets +X/+X until end of turn, where X is that creature's power.
+SVar:X:Targeted$CardPower
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_mentor.jpg
+SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/255.jpg
+Oracle:{2}{G}, {T}: Target creature gets +X/+X until end of turn, where X is that creature's power.
 End
\ No newline at end of file
diff --git a/src/main/java/forge/ComputerUtilAttack.java b/src/main/java/forge/ComputerUtilAttack.java
index 53834b78860..7d0c838a101 100644
--- a/src/main/java/forge/ComputerUtilAttack.java
+++ b/src/main/java/forge/ComputerUtilAttack.java
@@ -443,6 +443,7 @@ public class ComputerUtilAttack {
         // Attackers that don't really have a choice
         for (final Card attacker : this.attackers) {
             if ((attacker.hasKeyword("CARDNAME attacks each turn if able.")
+                    || !attacker.getSVar("MustAttack").equals("")
                     || attacker.hasKeyword("At the beginning of the end step, destroy CARDNAME.")
                     || attacker.hasKeyword("At the beginning of the end step, exile CARDNAME.")
                     || attacker.hasKeyword("At the beginning of the end step, sacrifice CARDNAME.")