From 5a1c3425d8cfadea61293b5183e5f3ce4f3f2cb5 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Tue, 30 Apr 2013 06:27:19 +0000
Subject: [PATCH] - Fixed Serene Remembrance.

---
 .../java/forge/card/ability/effects/ChangeZoneEffect.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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());