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 3d94fb7ff08..dd0cf705fe4 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
@@ -1554,13 +1554,17 @@ public class ChangeZoneAi extends SpellAbilityAi {
                     fetchList = CardLists.filter(fetchList, new Predicate<Card>() {
                         @Override
                         public boolean apply(final Card card) {
-                            if (card.isCreature() && ComputerUtilCard.isUselessCreature(player, card)) {
+                            if (card.getOwner().isOpponentOf(decider)) {
+                                return true;
+                            }
+
+                            if (card.isCreature() && ComputerUtilCard.isUselessCreature(decider, card)) {
                                 return true;
                             } else if (card.isEquipped()) {
                                 return false;
                             } else if (card.isEnchanted()) {
                                 for (Card enc : card.getEnchantedBy()) {
-                                    if (enc.getOwner().isOpponentOf(player)) {
+                                    if (enc.getOwner().isOpponentOf(decider)) {
                                         return true;
                                     }
                                 }