diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
index 51fce62e1df..c0b3b34f3db 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
@@ -35,6 +35,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
+import com.sun.corba.se.spi.monitoring.StatisticMonitoredAttribute;
 import mage.Constants.Outcome;
 import mage.Constants.RangeOfInfluence;
 import mage.Constants.TargetController;
@@ -88,10 +89,12 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
 
 	protected static FilterCreatureForCombat filter = new FilterCreatureForCombat();
 	protected static Choice replacementEffectChoice = new ChoiceImpl(true);
+	private static Map<String, Serializable> staticOptions = new HashMap<String, Serializable>();
 
 	static {
 		filter.setTargetController(TargetController.YOU);
 		replacementEffectChoice.setMessage("Choose replacement effect");
+		staticOptions.put("UI.right.btn.text", "Done");
 	}
 	protected transient TargetCreaturePermanent targetCombat = new TargetCreaturePermanent(filter);
 
@@ -229,7 +232,9 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
 	public boolean chooseTarget(Outcome outcome, Target target, Ability source, Game game) {
 		game.getState().setPriorityPlayerId(getId());
 		while (!abort) {
-			game.fireSelectTargetEvent(playerId, target.getMessage(), target.possibleTargets(source==null?null:source.getId(), playerId, game), target.isRequired(), null);
+			game.fireSelectTargetEvent(playerId, target.getMessage(),
+					target.possibleTargets(source==null?null:source.getId(), playerId, game),
+					target.isRequired(), target.getNumberOfTargets() != target.getMaxNumberOfTargets() ? staticOptions : null);
 			waitForResponse();
 			if (response.getUUID() != null) {
 				if (target instanceof TargetPermanent) {
diff --git a/Mage.Server/plugins/mage-player-ai-ma.jar b/Mage.Server/plugins/mage-player-ai-ma.jar
index 494b6c25f79..9a33ac8a8ee 100644
Binary files a/Mage.Server/plugins/mage-player-ai-ma.jar and b/Mage.Server/plugins/mage-player-ai-ma.jar differ
diff --git a/Mage.Server/plugins/mage-player-ai.jar b/Mage.Server/plugins/mage-player-ai.jar
index f181f2319c3..97f1180a7f4 100644
Binary files a/Mage.Server/plugins/mage-player-ai.jar and b/Mage.Server/plugins/mage-player-ai.jar differ
diff --git a/Mage.Server/plugins/mage-player-aiminimax.jar b/Mage.Server/plugins/mage-player-aiminimax.jar
index 9e56bc44a1c..54181cded5c 100644
Binary files a/Mage.Server/plugins/mage-player-aiminimax.jar and b/Mage.Server/plugins/mage-player-aiminimax.jar differ
diff --git a/Mage.Server/plugins/mage-player-human.jar b/Mage.Server/plugins/mage-player-human.jar
index f01cf42b7f1..50c2c3b8237 100644
Binary files a/Mage.Server/plugins/mage-player-human.jar and b/Mage.Server/plugins/mage-player-human.jar differ