diff --git a/res/cardsfolder/m/maralen_of_the_mornsong.txt b/res/cardsfolder/m/maralen_of_the_mornsong.txt
index b47a3f4448b..97ad52294a5 100644
--- a/res/cardsfolder/m/maralen_of_the_mornsong.txt
+++ b/res/cardsfolder/m/maralen_of_the_mornsong.txt
@@ -5,7 +5,7 @@ Text:Players can't draw cards.
 PT:2/3
 T:Mode$ Phase | Phase$ Draw | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of each player's draw step, that player loses 3 life, searches his or her library for a card, puts it into his or her hand, then shuffles his or her library.
 SVar:TrigDrain:AB$ LoseLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ 3 | SubAbility$ SVar=DBTutor
-SVar:DBTutor:DB$ ChangeZone | Defined$ TriggeredPlayer | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True
+SVar:DBTutor:DB$ ChangeZone | DefinedPlayer$ TriggeredPlayer | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/maralen_of_the_mornsong.jpg
diff --git a/res/cardsfolder/s/sunken_hope.txt b/res/cardsfolder/s/sunken_hope.txt
index d6e5c8bf47d..6ca660759b2 100644
--- a/res/cardsfolder/s/sunken_hope.txt
+++ b/res/cardsfolder/s/sunken_hope.txt
@@ -3,7 +3,7 @@ ManaCost:3 U U
 Types:Enchantment
 Text:no text
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Each | TriggerZones$ Battlefield | Execute$ TrigChangeZoneYou | TriggerDescription$ At the beginning of each player's upkeep, that player returns a creature he or she controls to its owner's hand.
-SVar:TrigChangeZoneYou:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Creature | Defined$ TriggeredPlayer | ChangeNum$ 1
+SVar:TrigChangeZoneYou:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Creature | DefinedPlayer$ TriggeredPlayer | ChangeNum$ 1
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunken_hope.jpg
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
index a89d4b9b540..e76eadb402f 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
@@ -337,7 +337,10 @@ public final class AbilityFactory_ChangeZone {
             }
             pDefined = tgt.getTargetPlayers();
         } else {
-            pDefined = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("DefinedPlayer"), sa);
+            if(params.containsKey("DefinedPlayer"))
+                pDefined = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("DefinedPlayer"), sa);
+            else
+                pDefined = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
         }
 
         String type = params.get("ChangeType");
@@ -588,7 +591,10 @@ public final class AbilityFactory_ChangeZone {
 
         ArrayList<Player> fetchers;
 
-        fetchers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("DefinedPlayer"), sa);
+        if(params.containsKey("DefinedPlayer"))
+            fetchers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("DefinedPlayer"), sa);
+        else
+            fetchers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
         
         //handle case when Defined is for a Card
         if (fetchers.isEmpty()) {