diff --git a/forge-ai/src/main/java/forge/ai/ability/ControlGainAi.java b/forge-ai/src/main/java/forge/ai/ability/ControlGainAi.java
index 32aa71bbcc1..d4cfdca8c5e 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ControlGainAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ControlGainAi.java
@@ -272,7 +272,16 @@ public class ControlGainAi extends SpellAbilityAi {
                 return true;
             }
         } else {
-            if(sa.hasParam("TargetingPlayer") || (!this.canPlayAI(ai, sa) && mandatory)) {
+            if (sa.hasParam("TargetingPlayer") || (!this.canPlayAI(ai, sa) && mandatory)) {
+                if (sa.getTargetRestrictions().canOnlyTgtOpponent()) {
+                    List<Player> oppList = ai.getOpponents().filter(PlayerPredicates.isTargetableBy(sa));
+                    if (oppList.isEmpty()) {
+                        return false;
+                    }
+                    sa.getTargets().add(Aggregates.random(oppList));
+                    return true;
+                }
+
                 List<Card> list = CardLists.getTargetableCards(ai.getCardsIn(ZoneType.Battlefield), sa);
                 if (list.isEmpty()) {
                     return false;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java
index 6f7c310e910..3ec8a944860 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java
@@ -49,7 +49,7 @@ public class AddPhaseEffect extends SpellAbilityEffect {
             extraPhaseList.addAll(PhaseType.PHASE_GROUPS.get(0));
         } else if (extra.equals("Combat")) {
             extraPhaseList.addAll(PhaseType.PHASE_GROUPS.get(2));
-        } else {    // Currently no effect will add End Phase
+        } else { // Currently no effect will add End Phase
             extraPhaseList.add(PhaseType.smartValueOf(extra));
         }