diff --git a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
index 43fc9522707..37efeeffec4 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
@@ -1156,6 +1156,8 @@ public class AttachAi extends SpellAbilityAi {
             if (card.hasKeyword("Shroud") || card.hasKeyword("Hexproof")) {
                 return false;
             }
+        } else if (keyword.equals("Defender")) {
+        	return false;
         }
         return true;
     }
diff --git a/forge-gui/res/cardsfolder/b/benalish_commander.txt b/forge-gui/res/cardsfolder/b/benalish_commander.txt
index 1d1f572c60d..7666014b683 100644
--- a/forge-gui/res/cardsfolder/b/benalish_commander.txt
+++ b/forge-gui/res/cardsfolder/b/benalish_commander.txt
@@ -9,6 +9,6 @@ T:Mode$ CounterRemoved | ValidCard$ Card.Self  | TriggerZones$ Exile | CounterTy
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1
 SVar:X:Count$xPaid
 SVar:Y:Count$Valid Soldier.YouCtrl
-SVar:RemAIDeck:True
+
 SVar:Picture:http://www.wizards.com/global/images/magic/general/benalish_commander.jpg
 Oracle:Benalish Commander's power and toughness are each equal to the number of Soldiers you control.\nSuspend X-{X}{W}{W}. X can't be 0. (Rather than cast this card from your hand, you may pay {X}{W}{W} and exile it with X time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)\nWhenever a time counter is removed from Benalish Commander while it's exiled, put a 1/1 white Soldier creature token onto the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/peregrine_mask.txt b/forge-gui/res/cardsfolder/p/peregrine_mask.txt
index b57683e9db9..b97f192f17a 100644
--- a/forge-gui/res/cardsfolder/p/peregrine_mask.txt
+++ b/forge-gui/res/cardsfolder/p/peregrine_mask.txt
@@ -3,5 +3,6 @@ ManaCost:1
 Types:Artifact Equipment
 K:Equip 2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Defender & Flying & First Strike | Description$ Equipped creature has defender, flying, and first strike.
+SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/peregrine_mask.jpg
 Oracle:Equipped creature has defender, flying, and first strike.\nEquip {2}
\ No newline at end of file