diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java
index bc81e11d6e9..7883f0c83b3 100644
--- a/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java
+++ b/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java
@@ -51,24 +51,25 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
 
         if ((!sa.usesTargeting() && !sa.hasParam("Defined")) || sa.hasParam("UseAllOriginZones")) {
             cards = game.getCardsIn(origin);
-        } else if (origin.contains(ZoneType.Library) && sa.hasParam("Search")) {
-            // Search library using changezoneall effect need a param "Search"
-            if (sa.getActivatingPlayer().hasKeyword("LimitSearchLibrary")) {
-                for (final Player p : tgtPlayers) {
-                    cards.addAll(p.getCardsIn(origin));
-                    cards.removeAll(p.getCardsIn(ZoneType.Library));
-                    int fetchNum = Math.min(p.getCardsIn(ZoneType.Library).size(), 4);
-                    cards.addAll(p.getCardsIn(ZoneType.Library, fetchNum));
-                }
-            }
-            if (sa.getActivatingPlayer().hasKeyword("CantSearchLibrary")) {
-                // all these cards have "then that player shuffles", mandatory shuffle
-                cards.removeAll(game.getCardsIn(ZoneType.Library));
-            }
         } else {
             for (final Player p : tgtPlayers) {
                 cards.addAll(p.getCardsIn(origin));
             }
+            if (origin.contains(ZoneType.Library) && sa.hasParam("Search")) {
+                // Search library using changezoneall effect need a param "Search"
+                if (sa.getActivatingPlayer().hasKeyword("LimitSearchLibrary")) {
+                    for (final Player p : tgtPlayers) {
+                        cards.addAll(p.getCardsIn(origin));
+                        cards.removeAll(p.getCardsIn(ZoneType.Library));
+                        int fetchNum = Math.min(p.getCardsIn(ZoneType.Library).size(), 4);
+                        cards.addAll(p.getCardsIn(ZoneType.Library, fetchNum));
+                    }
+                }
+                if (sa.getActivatingPlayer().hasKeyword("CantSearchLibrary")) {
+                    // all these cards have "then that player shuffles", mandatory shuffle
+                    cards.removeAll(game.getCardsIn(ZoneType.Library));
+                }
+            }
         }
         
         if (origin.contains(ZoneType.Library) && sa.hasParam("Search") && !sa.getActivatingPlayer().hasKeyword("CantSearchLibrary")) {