diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/BoostAllTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/BoostAllTest.java
new file mode 100644
index 0000000000..6368d0a7e3
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/BoostAllTest.java
@@ -0,0 +1,62 @@
+/*
+ *  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 org.mage.test.cards.continuous;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class BoostAllTest extends CardTestPlayerBase {
+
+    /**
+     * Verdeloth the Ancient pump effect affect it self. Printed "Other"
+     */
+    @Test
+    public void testBoostWithOther() {
+        // Kicker {X}
+        // Saproling creatures and other Treefolk creatures get +1/+1.
+        // When Verdeloth the Ancient enters the battlefield, if it was kicked, put X 1/1 green Saproling creature tokens onto the battlefield.
+        addCard(Zone.BATTLEFIELD, playerA, "Verdeloth the Ancient", 1); // 4/7
+        addCard(Zone.BATTLEFIELD, playerA, "Heartwood Treefolk", 1); // 3/4
+        addCard(Zone.BATTLEFIELD, playerB, "Heartwood Treefolk", 1); // 3/4
+
+        setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
+        execute();
+
+        assertPowerToughness(playerA, "Verdeloth the Ancient", 4, 7);
+        assertPowerToughness(playerA, "Heartwood Treefolk", 4, 5);
+        assertPowerToughness(playerA, "Heartwood Treefolk", 4, 5);
+
+    }
+
+}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java
index daf6921586..e07aedd5ec 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java
@@ -72,4 +72,25 @@ public class EldraziMimicTest extends CardTestPlayerBase {
 
     }
 
+    /**
+     * Eldrazi Mimic ability to change it's health and power on another
+     * creatures entering the battlefield doesn't work after update.
+     */
+    @Test
+    public void testNormalCopy() {
+        addCard(Zone.HAND, playerA, "Composite Golem", 1); // 4/4
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 6);
+        // Whenever another colorless creature enters the battlefield under your control, you may have the base power and toughness of Eldrazi Mimic
+        // become that creature's power and toughness until end of turn.
+        addCard(Zone.BATTLEFIELD, playerA, "Eldrazi Mimic", 1); // 2/1
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Composite Golem");
+        setChoice(playerA, "Yes");
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPowerToughness(playerA, "Composite Golem", 4, 4);
+        assertPowerToughness(playerA, "Eldrazi Mimic", 4, 4);
+
+    }
 }
diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java
index ae84e34288..4a40ff11c4 100644
--- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java
@@ -108,9 +108,9 @@ public class EntersBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl {
         if (permanent != null && filter.match(permanent, getSourceId(), getControllerId(), game)) {
             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(permanent, game));
                             break;
                         case PLAYER:
                             effect.setTargetPointer(new FixedTarget(permanent.getControllerId()));