diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
index e8d548f12a4..71f1d736a8d 100644
--- a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
+++ b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
@@ -920,9 +920,11 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 game.getAction().moveToHand(tgtSA.getSourceCard());
             } else if (srcSA.getParam("Destination").equals("BottomOfLibrary")) {
                 game.getAction().moveToBottomOfLibrary(tgtSA.getSourceCard());
-            } else if (srcSA.getParam("Destination").equals("ShuffleIntoLibrary")) {
+            } else if (srcSA.getParam("Destination").equals("Library")) {
                 game.getAction().moveToBottomOfLibrary(tgtSA.getSourceCard());
-                tgtSA.getSourceCard().getController().shuffle();
+                if (srcSA.hasParam("Shuffle")) {
+                    tgtSA.getSourceCard().getOwner().shuffle();
+                }
             } else {
                 throw new IllegalArgumentException("AbilityFactory_ChangeZone: Invalid Destination argument for card "
                         + srcSA.getSourceCard().getName());