diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
index 48e2d426d31..ca1c95ed64a 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
@@ -326,10 +326,9 @@ public class AbilityFactoryDestroy {
                 }
             }
         }
-        System.out.println("destroy2");
+
         final AbilitySub subAb = sa.getSubAbility();
         if (subAb != null) {
-            System.out.println("destroy3");
             chance &= subAb.chkAIDrawback();
         }
 
diff --git a/src/main/java/forge/game/player/ComputerUtilAttack.java b/src/main/java/forge/game/player/ComputerUtilAttack.java
index 256c923c42b..610a3d0ea65 100644
--- a/src/main/java/forge/game/player/ComputerUtilAttack.java
+++ b/src/main/java/forge/game/player/ComputerUtilAttack.java
@@ -145,7 +145,7 @@ public class ComputerUtilAttack {
             return true;
         }
 
-        final List<Card> controlledByCompy = AllZone.getComputerPlayer().getAllCards();
+        final List<Card> controlledByCompy = AllZone.getComputerPlayer().getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES);
         for (final Card c : controlledByCompy) {
             for (final Trigger trigger : c.getTriggers()) {
                 if (CombatUtil.combatTriggerWillTrigger(attacker, null, trigger, combat)) {