diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index d39918466bb..664d4ff960f 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -859,12 +859,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
         if (sa.hasParam("DefinedPlayer")) {
             fetchers = AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("DefinedPlayer"), sa);
         } else {
-            fetchers = AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("Defined"), sa);
-        }
-
-        // handle case when Defined is for a Card
-        if (fetchers.isEmpty()) {
-            fetchers.add(sa.getHostCard().getController());
+            fetchers = Lists.newArrayList(sa.getActivatingPlayer());
         }
 
         Player chooser = null;
diff --git a/forge-gui/res/cardsfolder/w/whirlpool_whelm.txt b/forge-gui/res/cardsfolder/w/whirlpool_whelm.txt
index 7a93f2f5cbc..8e980279979 100644
--- a/forge-gui/res/cardsfolder/w/whirlpool_whelm.txt
+++ b/forge-gui/res/cardsfolder/w/whirlpool_whelm.txt
@@ -2,7 +2,7 @@ Name:Whirlpool Whelm
 ManaCost:1 U
 Types:Instant
 A:SP$ Clash | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | WinSubAbility$ DBLibrary | OtherwiseSubAbility$ DBHand | RememberTargets$ True | SpellDescription$ Clash with an opponent, then return target creature to its owner's hand. If you win, you may put that creature on top of its owner's library instead.
-SVar:DBLibrary:DB$ ChangeZone | Defined$ TargetedController | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | RememberChanged$ True | ChangeType$ Card.IsRemembered | Hidden$ True | Chooser$ You | SubAbility$ DBDeclined
+SVar:DBLibrary:DB$ ChangeZone | DefinedPlayer$ TargetedController | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | RememberChanged$ True | ChangeType$ Card.IsRemembered | Hidden$ True | Chooser$ You | SubAbility$ DBDeclined
 SVar:DBDeclined:DB$ ChangeZone | Defined$ Targeted | Origin$ Battlefield | Destination$ Hand | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
 SVar:DBHand:DB$ ChangeZone | Defined$ Targeted | Origin$ Battlefield | Destination$ Hand
 SVar:X:Remembered$Amount