diff --git a/Mage.Sets/src/mage/cards/c/CovetedPeacock.java b/Mage.Sets/src/mage/cards/c/CovetedPeacock.java
index dbe7642a59..90130da213 100644
--- a/Mage.Sets/src/mage/cards/c/CovetedPeacock.java
+++ b/Mage.Sets/src/mage/cards/c/CovetedPeacock.java
@@ -1,4 +1,3 @@
-
 package mage.cards.c;
 
 import mage.MageInt;
@@ -39,7 +38,7 @@ public final class CovetedPeacock extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Whenever Coveted Peacock attacks, you may goad target creature defending player controls.
-        Ability ability = new AttacksTriggeredAbility(new GoadTargetEffect(), true, "Whenever {this} attacks, you may goad target creature defending player controls.");
+        Ability ability = new AttacksTriggeredAbility(new GoadTargetEffect(), true);
         ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/g/GoblinRacketeer.java b/Mage.Sets/src/mage/cards/g/GoblinRacketeer.java
index c70dbf9aac..b5f7b57127 100644
--- a/Mage.Sets/src/mage/cards/g/GoblinRacketeer.java
+++ b/Mage.Sets/src/mage/cards/g/GoblinRacketeer.java
@@ -1,4 +1,3 @@
-
 package mage.cards.g;
 
 import mage.MageInt;
@@ -35,7 +34,7 @@ public final class GoblinRacketeer extends CardImpl {
         this.toughness = new MageInt(2);
 
         // Whenever Goblin Racketeer attacks, you may goad target creature defending player controls.
-        Ability ability = new AttacksTriggeredAbility(new GoadTargetEffect(), true, "Whenever {this} attacks, you may goad target creature defending player controls");
+        Ability ability = new AttacksTriggeredAbility(new GoadTargetEffect(), true);
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }
diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
index 55e5bfb9c2..86e8b629eb 100644
--- a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
+++ b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
@@ -1,7 +1,5 @@
 package mage.abilities;
 
-import java.util.Locale;
-import java.util.UUID;
 import mage.MageObject;
 import mage.abilities.effects.Effect;
 import mage.constants.AbilityType;
@@ -13,8 +11,10 @@ import mage.game.events.GameEvent.EventType;
 import mage.game.events.ZoneChangeEvent;
 import mage.players.Player;
 
+import java.util.Locale;
+import java.util.UUID;
+
 /**
- *
  * @author BetaSteward_at_googlemail.com
  */
 public abstract class TriggeredAbilityImpl extends AbilityImpl implements TriggeredAbility {
@@ -111,7 +111,8 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
                         || ruleLow.startsWith("untap")
                         || ruleLow.startsWith("put")
                         || ruleLow.startsWith("remove")
-                        || ruleLow.startsWith("counter")) {
+                        || ruleLow.startsWith("counter")
+                        || ruleLow.startsWith("goad")) {
                     sb.append("you may ");
                 } else if (!ruleLow.startsWith("its controller may")) {
                     sb.append("you may have ");
@@ -164,7 +165,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
                         } else if (((ZoneChangeEvent) event).getTarget() != null) {
                             source = ((ZoneChangeEvent) event).getTarget();
                         } else {
-                            source = game.getLastKnownInformation(getSourceId(), ((ZoneChangeEvent) event).getZone());
+                            source = game.getLastKnownInformation(getSourceId(), event.getZone());
                         }
                     }
 
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/GoadTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/GoadTargetEffect.java
index b1a5445efd..dd0f43f913 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/GoadTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/GoadTargetEffect.java
@@ -1,6 +1,7 @@
 package mage.abilities.effects.common.combat;
 
 import mage.abilities.Ability;
+import mage.abilities.Mode;
 import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.OneShotEffect;
 import mage.constants.Duration;
@@ -24,7 +25,6 @@ public class GoadTargetEffect extends OneShotEffect {
      */
     public GoadTargetEffect() {
         super(Outcome.Detriment);
-        staticText = "you may goad target creature. <i>(Until your next turn, that creature attacks each combat if able and attacks a player other than you if able.)</i>";
     }
 
     public GoadTargetEffect(final GoadTargetEffect effect) {
@@ -59,4 +59,9 @@ public class GoadTargetEffect extends OneShotEffect {
         }
         return true;
     }
+
+    @Override
+    public String getText(Mode mode) {
+        return "goad target " + mode.getTargets().get(0).getTargetName() + ". <i>(Until your next turn, that creature attacks each combat if able and attacks a player other than you if able.)</i>";
+    }
 }