diff --git a/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java b/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java
index abf1909002..955c9019f0 100644
--- a/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java
+++ b/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java
@@ -81,7 +81,6 @@ public class GarrukApexPredator extends CardImpl {
         this.expansionSetCode = "M15";
         this.subtype.add("Garruk");
 
-
         this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(5)), false));
 
         // +1: Destroy another target planeswalker.
@@ -100,7 +99,9 @@ public class GarrukApexPredator extends CardImpl {
         this.addAbility(ability);
 
         // -8: Target opponent gets an emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn."
-        ability = new LoyaltyAbility(new GetEmblemTargetPlayerEffect(new GarrukApexPredatorEmblem()), -8);
+        Effect effect = new GetEmblemTargetPlayerEffect(new GarrukApexPredatorEmblem());
+        effect.setText("Target opponent gets an emblem with \"Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn.\"");
+        ability = new LoyaltyAbility(effect, -8);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
     }
@@ -162,13 +163,14 @@ class GarrukApexPredatorBeastToken extends Token {
 }
 
 /**
- * Emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn."
+ * Emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample
+ * until end of turn."
  */
 class GarrukApexPredatorEmblem extends Emblem {
 
     public GarrukApexPredatorEmblem() {
         setName("EMBLEM: Garruk, Apex Predator");
-        Effect effect = new BoostTargetEffect(5,5,Duration.EndOfTurn);
+        Effect effect = new BoostTargetEffect(5, 5, Duration.EndOfTurn);
         effect.setText("it gets +5/+5");
         Ability ability = new AttackedByCreatureTriggeredAbility(Zone.COMMAND, effect, false, SetTargetPointer.PERMANENT);
         effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn,
@@ -176,4 +178,4 @@ class GarrukApexPredatorEmblem extends Emblem {
         ability.addEffect(effect);
         this.getAbilities().add(ability);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage/src/mage/abilities/common/AttackedByCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/AttackedByCreatureTriggeredAbility.java
index 456d02029c..b3182dc1c4 100644
--- a/Mage/src/mage/abilities/common/AttackedByCreatureTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/AttackedByCreatureTriggeredAbility.java
@@ -1,31 +1,30 @@
 /*
-* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without modification, are
-* permitted provided that the following conditions are met:
-*
-*    1. Redistributions of source code must retain the above copyright notice, this list of
-*       conditions and the following disclaimer.
-*
-*    2. Redistributions in binary form must reproduce the above copyright notice, this list
-*       of conditions and the following disclaimer in the documentation and/or other materials
-*       provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
-* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
-* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* The views and conclusions contained in the software and documentation are those of the
-* authors and should not be interpreted as representing official policies, either expressed
-* or implied, of BetaSteward_at_googlemail.com.
-*/
-
+ * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of BetaSteward_at_googlemail.com.
+ */
 package mage.abilities.common;
 
 import java.util.UUID;
@@ -57,13 +56,13 @@ public class AttackedByCreatureTriggeredAbility extends TriggeredAbilityImpl {
     public AttackedByCreatureTriggeredAbility(Effect effect, boolean optional, SetTargetPointer setTargetPointer) {
         this(Zone.BATTLEFIELD, effect, optional, setTargetPointer);
     }
-    
+
     public AttackedByCreatureTriggeredAbility(Zone zone, Effect effect, boolean optional, SetTargetPointer setTargetPointer) {
         super(zone, effect, optional);
         this.setTargetPointer = setTargetPointer;
     }
-    
-    public AttackedByCreatureTriggeredAbility(AttackedByCreatureTriggeredAbility ability) {
+
+    public AttackedByCreatureTriggeredAbility(final AttackedByCreatureTriggeredAbility ability) {
         super(ability);
         this.setTargetPointer = ability.setTargetPointer;
     }
@@ -80,9 +79,9 @@ public class AttackedByCreatureTriggeredAbility extends TriggeredAbilityImpl {
         if (getControllerId().equals(playerId) && attackingCreature != null) {
             if (!setTargetPointer.equals(SetTargetPointer.NONE)) {
                 for (Effect effect : this.getEffects()) {
-                    switch(setTargetPointer) {
+                    switch (setTargetPointer) {
                         case PERMANENT:
-                            effect.setTargetPointer(new FixedTarget(event.getTargetId()));
+                            effect.setTargetPointer(new FixedTarget(attackingCreature.getId()));
                             break;
                         case PLAYER:
                             effect.setTargetPointer(new FixedTarget(attackingCreature.getControllerId()));