diff --git a/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java b/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java
index 3242700fd77..35e8409732a 100644
--- a/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java
+++ b/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java
@@ -5,7 +5,6 @@ import java.util.List;
 
 import forge.game.Game;
 import forge.game.GameObject;
-import forge.game.card.CardUtil;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
@@ -21,16 +20,8 @@ public class PossibleTargetSelector {
         this.tgt = sa.getTargetRestrictions();
         this.targetIndex = 0;
         this.validTargets = new ArrayList<GameObject>();
-        if (tgt.canTgtPermanent() || tgt.canTgtCreature()) {
-            // TODO: What about things that target enchantments and such?
-            validTargets.addAll(CardUtil.getValidCardsToTarget(tgt, sa));
-        }
-        if (tgt.canTgtPlayer()) {
-            for (Player p : game.getPlayers()) {
-                if (p != self || !tgt.canOnlyTgtOpponent()) {
-                    validTargets.add(p);
-                }
-            }
+        for (GameObject o : tgt.getAllCandidates(sa, true)) {
+            validTargets.add(o);
         }
     }