diff --git a/Mage.Sets/src/mage/sets/odyssey/GracefulAntelope.java b/Mage.Sets/src/mage/sets/odyssey/GracefulAntelope.java
index 3cb9cc8c37..e3527273ec 100644
--- a/Mage.Sets/src/mage/sets/odyssey/GracefulAntelope.java
+++ b/Mage.Sets/src/mage/sets/odyssey/GracefulAntelope.java
@@ -58,7 +58,6 @@ public class GracefulAntelope extends CardImpl<GracefulAntelope> {
         // Plainswalk
         this.addAbility(new PlainswalkAbility());
         // Whenever Graceful Antelope deals combat damage to a player, you may have target land become a Plains until Graceful Antelope leaves the battlefield.
-        //Ability ability = new SimpleTriggeredAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.WhileOnBattlefield), new TapSourceCost());
         Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new BecomesBasicLandTargetEffect(Duration.WhileOnBattlefield,"Plains"), true);
         Target target = new TargetLandPermanent();
         target.setRequired(true);
diff --git a/Mage.Sets/src/mage/sets/theros/ProphetOfKruphix.java b/Mage.Sets/src/mage/sets/theros/ProphetOfKruphix.java
index a87188ee1b..8d6d2e7efd 100644
--- a/Mage.Sets/src/mage/sets/theros/ProphetOfKruphix.java
+++ b/Mage.Sets/src/mage/sets/theros/ProphetOfKruphix.java
@@ -74,7 +74,7 @@ public class ProphetOfKruphix extends CardImpl<ProphetOfKruphix> {
         this.toughness = new MageInt(3);
 
         // Untap all creatures and lands you control during each other player's untap step.
-        Effect effect = new UntapAllControllerEffect(filter, "Untap all creatures and lands you control during each other player's untap step");
+        Effect effect = new UntapAllControllerEffect(filter, "Untap all creatures and lands you control");
         this.addAbility(new BeginningOfUntapTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.NOT_YOU, false));
         // You may cast creature cards as though they had flash.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProphetOfKruphixEffect()));
diff --git a/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java
index 58f17a27d5..38850b0a8c 100644
--- a/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java
@@ -10,6 +10,7 @@ import mage.constants.TargetController;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
+import mage.players.Player;
 import mage.target.targetpointer.FixedTarget;
 
 /**
@@ -53,6 +54,17 @@ public class BeginningOfUntapTriggeredAbility extends TriggeredAbilityImpl<Begin
                         }
                     }
                     return yours;
+                case NOT_YOU:
+                    Player controller = game.getPlayer(this.getControllerId());
+                    if (controller != null && controller.getInRange().contains(event.getPlayerId()) && !event.getPlayerId().equals(this.getControllerId())) {
+                        if (getTargets().size() == 0) {
+                            for (Effect effect : this.getEffects()) {
+                                effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
+                            }
+                        }
+                        return true;
+                    }
+		    break;
                 case OPPONENT:
                     if (game.getOpponents(this.controllerId).contains(event.getPlayerId())) {
                         if (getTargets().size() == 0) {
@@ -64,12 +76,15 @@ public class BeginningOfUntapTriggeredAbility extends TriggeredAbilityImpl<Begin
                     }
 		    break;
                 case ANY:
-                    if (getTargets().size() == 0) {
-                        for (Effect effect : this.getEffects()) {
-                            effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
+                    controller = game.getPlayer(this.getControllerId());
+                    if (controller != null && controller.getInRange().contains(event.getPlayerId())) {
+                        if (getTargets().size() == 0) {
+                            for (Effect effect : this.getEffects()) {
+                                effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
+                            }
                         }
+                        return true;
                     }
-                    return true;
             }
         }
         return false;
@@ -77,15 +92,19 @@ public class BeginningOfUntapTriggeredAbility extends TriggeredAbilityImpl<Begin
 
     @Override
     public String getRule() {
+        StringBuilder sb = new StringBuilder();
         switch (targetController) {
             case YOU:
-                return "At the beginning of your untap step, " + generateZoneString() + getEffects().getText(modes.getMode());
+                return sb.append("At the beginning of your untap step, ").append(generateZoneString()).append(getEffects().getText(modes.getMode())).toString();
+            case NOT_YOU:
+                return sb.append(getEffects().getText(modes.getMode())).append(" during each other player's untap step").append(generateZoneString()).toString();
             case OPPONENT:
-                return "At the beginning of each opponent's untap step, " + generateZoneString() + getEffects().getText(modes.getMode());
+                return sb.append("At the beginning of each opponent's untap step, ").append(generateZoneString()).append(getEffects().getText(modes.getMode())).toString();
             case ANY:
-                return "At the beginning of each player's untap step, " + generateZoneString() + getEffects().getText(modes.getMode());
+                return sb.append("At the beginning of each player's untap step, ").append(generateZoneString()).append(getEffects().getText(modes.getMode())).toString();
+
         }
-        return "";
+        return "BeginningOfUntapTriggeredAbility: targetController value not supported";
     }
 
     private String generateZoneString() {