diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
index 1e587b995b1..ebd8da1cd0f 100644
--- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
+++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
@@ -1406,11 +1406,13 @@ public class TestPlayer implements Player {
         }
         if (!choices.isEmpty()) {
             for (String choice : choices) {
-                for (int index = 0; index < rEffects.size(); index++) {
-                    if (choice.equals(rEffects.get(Integer.toString(index)))) {
+                int index = 0;
+                for (Map.Entry<String, String> entry : rEffects.entrySet()) {
+                    if (entry.getValue().startsWith(choice)) {
                         choices.remove(choice);
                         return index;
                     }
+                    index++;
                 }
             }
             // TODO: enable fail checks and fix tests
diff --git a/Mage/src/main/java/mage/players/Player.java b/Mage/src/main/java/mage/players/Player.java
index 6e5c31dc3bb..6dc09c8f9dd 100644
--- a/Mage/src/main/java/mage/players/Player.java
+++ b/Mage/src/main/java/mage/players/Player.java
@@ -569,6 +569,7 @@ public interface Player extends MageItem, Copyable<Player> {
     // set the value for non mana X costs
     int announceXCost(int min, int max, String message, Game game, Ability ability, VariableCost variableCost);
 
+    // TODO: rework choose replacement effects to use array, not map (it'a random order now)
     int chooseReplacementEffect(Map<String, String> abilityMap, Game game);
 
     TriggeredAbility chooseTriggeredAbility(List<TriggeredAbility> abilities, Game game);