diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
index eb98e10cd4d..5e3f540cee7 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
@@ -94,7 +94,8 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
 
         if ((destination == ZoneType.Library || destination == ZoneType.PlanarDeck)
         		&& !sa.hasParam("Shuffle") && cards.size() >= 2 && !random) {
-            cards = (CardCollection)sa.getActivatingPlayer().getController().orderMoveToZoneList(cards, destination);
+            Player p = AbilityUtils.getDefinedPlayers(source, sa.getParamOrDefault("DefinedPlayer", "You"), sa).get(0);
+            cards = (CardCollection) p.getController().orderMoveToZoneList(cards, destination);
         }
 
         if (destination.equals(ZoneType.Library) && random) {
diff --git a/forge-gui/res/cardsfolder/t/teferis_puzzle_box.txt b/forge-gui/res/cardsfolder/t/teferis_puzzle_box.txt
index 6cca6f26bf3..0efde0795f1 100644
--- a/forge-gui/res/cardsfolder/t/teferis_puzzle_box.txt
+++ b/forge-gui/res/cardsfolder/t/teferis_puzzle_box.txt
@@ -2,7 +2,7 @@ Name:Teferi's Puzzle Box
 ManaCost:4
 Types:Artifact
 T:Mode$ Phase | Phase$ Draw | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigChangeAll | TriggerDescription$ At the beginning of each player's draw step, that player puts the cards in his or her hand on the bottom of his or her library in any order, then draws that many cards.
-SVar:TrigChangeAll:DB$ ChangeZoneAll | Defined$ TriggeredPlayer | Origin$ Hand | Destination$ Library | LibraryPosition$ -1 | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBDraw
+SVar:TrigChangeAll:DB$ ChangeZoneAll | DefinedPlayer$ TriggeredPlayer | Defined$ TriggeredPlayer | Origin$ Hand | Destination$ Library | LibraryPosition$ -1 | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ X | Defined$ TriggeredPlayer | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount