diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
index f1bb3484341..78262d9174d 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
@@ -793,20 +793,22 @@ public class ChangeZoneAi extends SpellAbilityAi {
                     }
                 }
                 
-                // When bouncing opponents stuff, don't bounce cards with CMC 0
-                list = CardLists.filter(list, new Predicate<Card>() {
-                    @Override
-                    public boolean apply(final Card c) {
-                        for (Card aura : c.getEnchantedBy()) {
-                            if (aura.getController().isOpponentOf(ai)) {
-                                return true;
-                            } else {
-                                return false;
-                            }
-                        }
-                        return c.isToken() || c.getCMC() > 0;
-                    }
-                });
+                if (!CardLists.getNotType(list, "Land").isEmpty()) {
+	                // When bouncing opponents stuff other than lands, don't bounce cards with CMC 0
+	                list = CardLists.filter(list, new Predicate<Card>() {
+	                    @Override
+	                    public boolean apply(final Card c) {
+	                        for (Card aura : c.getEnchantedBy()) {
+	                            if (aura.getController().isOpponentOf(ai)) {
+	                                return true;
+	                            } else {
+	                                return false;
+	                            }
+	                        }
+	                        return c.isToken() || c.getCMC() > 0;
+	                    }
+	                });
+                }
                 // TODO: Blink permanents with ETB triggers
                 /*else if (!sa.isTrigger() && SpellAbilityAi.playReusable(ai, sa)) {
                     aiPermanents = CardLists.filter(aiPermanents, new Predicate<Card>() {
diff --git a/forge-gui/res/cardsfolder/d/demonmail_hauberk.txt b/forge-gui/res/cardsfolder/d/demonmail_hauberk.txt
index f55943bcde8..108cf13e4ef 100644
--- a/forge-gui/res/cardsfolder/d/demonmail_hauberk.txt
+++ b/forge-gui/res/cardsfolder/d/demonmail_hauberk.txt
@@ -3,5 +3,6 @@ ManaCost:4
 Types:Artifact Equipment
 K:Equip Sac<1/Creature>
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ 4 | AddToughness$ 2 | Description$ Equipped creature gets +4/+2.
+SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/demonmail_hauberk.jpg
 Oracle:Equipped creature gets +4/+2.\nEquip-Sacrifice a creature.