diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java
index c4edc387267..f2599117912 100644
--- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java
+++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java
@@ -72,6 +72,8 @@ public class ComputerPlayerMCTS extends ComputerPlayer<ComputerPlayerMCTS> imple
     public void priority(Game game) {
         getNextAction(game);
         Ability ability =  root.getAction();
+        if (ability == null)
+            logger.fatal("null ability");
         activateAbility((ActivatedAbility)ability, game);
     }
 
@@ -292,8 +294,7 @@ public class ComputerPlayerMCTS extends ComputerPlayer<ComputerPlayerMCTS> imple
 			Player origPlayer = game.getState().getPlayers().get(copyPlayer.getId());
 			MCTSPlayer newPlayer = new MCTSPlayer(copyPlayer.getId());
 			newPlayer.restore(origPlayer);
-            //FIXME: this shuffling causes event to trigger that is not correct
-            newPlayer.shuffleLibrary(mcts);
+            newPlayer.getLibrary().shuffle();
 			mcts.getState().getPlayers().put(copyPlayer.getId(), newPlayer);
 		}
 		mcts.setSimulation(true);
diff --git a/Mage.Server/plugins/mage-player-aimcts.jar b/Mage.Server/plugins/mage-player-aimcts.jar
index 6d732f5da10..7e274e6e378 100644
Binary files a/Mage.Server/plugins/mage-player-aimcts.jar and b/Mage.Server/plugins/mage-player-aimcts.jar differ