diff --git a/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java b/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java
index aece380a165..4d4e65e231a 100644
--- a/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java
+++ b/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java
@@ -77,7 +77,7 @@ class CharmbreakerDevilsEffect extends OneShotEffect {
         TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_INSTANT_AND_SORCERY);
         target.setRandom(true);
         target.setNotTarget(true);
-        player.chooseTarget(outcome, target, source, game);
+        target.chooseTarget(outcome, player.getId(), source, game);
         Card card = game.getCard(target.getFirstTarget());
         return card != null && player.moveCards(card, Zone.HAND, source, game);
     }
diff --git a/Mage.Sets/src/mage/cards/c/CinderheartGiant.java b/Mage.Sets/src/mage/cards/c/CinderheartGiant.java
index 262149ea57d..4dc474cf9fe 100644
--- a/Mage.Sets/src/mage/cards/c/CinderheartGiant.java
+++ b/Mage.Sets/src/mage/cards/c/CinderheartGiant.java
@@ -77,7 +77,7 @@ class CinderheartGiantEffect extends OneShotEffect {
         TargetPermanent target = new TargetOpponentsCreaturePermanent();
         target.setNotTarget(true);
         target.setRandom(true);
-        player.chooseTarget(outcome, target, source, game);
+        target.chooseTarget(outcome, player.getId(), source, game);
         Permanent permanent = game.getPermanent(target.getFirstTarget());
         return permanent != null && permanent.damage(7, source.getSourceId(), source, game) > 0;
     }
diff --git a/Mage.Sets/src/mage/cards/g/Ghoulraiser.java b/Mage.Sets/src/mage/cards/g/Ghoulraiser.java
index b70c6b27b9f..84ea5154629 100644
--- a/Mage.Sets/src/mage/cards/g/Ghoulraiser.java
+++ b/Mage.Sets/src/mage/cards/g/Ghoulraiser.java
@@ -75,7 +75,7 @@ class GhoulraiserEffect extends OneShotEffect {
         TargetCard target = new TargetCardInYourGraveyard(filter);
         target.setNotTarget(true);
         target.setRandom(true);
-        player.chooseTarget(outcome, target, source, game);
+        target.chooseTarget(outcome, player.getId(), source, game);
         return player.moveCards(game.getCard(target.getFirstTarget()), Zone.HAND, source, game);
     }
 }
diff --git a/Mage.Sets/src/mage/cards/h/HauntedFengraf.java b/Mage.Sets/src/mage/cards/h/HauntedFengraf.java
index 9ab1ed054a2..13664894eb5 100644
--- a/Mage.Sets/src/mage/cards/h/HauntedFengraf.java
+++ b/Mage.Sets/src/mage/cards/h/HauntedFengraf.java
@@ -73,7 +73,7 @@ class HauntedFengrafEffect extends OneShotEffect {
         TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE);
         target.setNotTarget(true);
         target.setRandom(true);
-        player.chooseTarget(outcome, target, source, game);
+        target.chooseTarget(outcome, player.getId(), source, game);
         return player.moveCards(game.getCard(target.getFirstTarget()), Zone.HAND, source, game);
     }
 }
diff --git a/Mage.Sets/src/mage/cards/m/MakeAWish.java b/Mage.Sets/src/mage/cards/m/MakeAWish.java
index 6ccc5a56dd1..6f6ac29406c 100644
--- a/Mage.Sets/src/mage/cards/m/MakeAWish.java
+++ b/Mage.Sets/src/mage/cards/m/MakeAWish.java
@@ -63,7 +63,7 @@ class MakeAWishEffect extends OneShotEffect {
         TargetCard target = new TargetCardInYourGraveyard(Math.min(player.getGraveyard().size(), 2), StaticFilters.FILTER_CARD);
         target.setNotTarget(true);
         target.setRandom(true);
-        player.chooseTarget(outcome, target, source, game);
+        target.chooseTarget(outcome, player.getId(), source, game);
         return player.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game);
     }
 }
diff --git a/Mage.Sets/src/mage/cards/r/RadiantScrollwielder.java b/Mage.Sets/src/mage/cards/r/RadiantScrollwielder.java
index fc7baddd304..7c9eae74af4 100644
--- a/Mage.Sets/src/mage/cards/r/RadiantScrollwielder.java
+++ b/Mage.Sets/src/mage/cards/r/RadiantScrollwielder.java
@@ -97,7 +97,7 @@ class RadiantScrollwielderEffect extends OneShotEffect {
         TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY);
         target.setNotTarget(true);
         target.setRandom(true);
-        player.chooseTarget(outcome, target, source, game);
+        target.chooseTarget(outcome, player.getId(), source, game);
         Card card = game.getCard(target.getFirstTarget());
         if (card == null) {
             return false;