diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 0fe2f6e0484..1b7c5b52fa4 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -9320,6 +9320,7 @@ public class CardFactory_Creatures {
                                 }// If an enchantment is selected
                             }// If there are enchantments in library
                             
+                            card.getController().shuffle();
                         }// If answered yes to may exile
                     }// If player is human
                     
@@ -9341,6 +9342,7 @@ public class CardFactory_Creatures {
                             if (card.getName().equals("Academy Rector")) {
                                 AllZone.GameAction.exile(card);
                             }
+                            card.getController().shuffle();
                         }
                     }// player is the computer
                 }// resolve()