diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java b/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java
index ebb0c56d9a9..5caac4468eb 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java
@@ -75,10 +75,12 @@ public class TamiyoTheMoonSage extends CardImpl<TamiyoTheMoonSage> {
         ability.addEffect(new SkipNextUntapTargetEffect());
         ability.addTarget(new TargetPermanent());
         this.addAbility(ability);
+
         // -2: Draw a card for each tapped creature target player controls.
         ability = new LoyaltyAbility(new DrawCardControllerEffect(new TappedCreaturesControlledByTargetCount()), -2);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
+
         // -8: You get an emblem with "You have no maximum hand size" and "Whenever a card is put into your graveyard from anywhere, you may return it to your hand."
         this.addAbility(new LoyaltyAbility(new GetEmblemEffect(new TamiyoTheMoonSageEmblem()), -8));
     }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java
new file mode 100644
index 00000000000..aed73a998d1
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java
@@ -0,0 +1,32 @@
+package org.mage.test.cards.continuous;
+
+import mage.Constants;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ * @author noxx
+ */
+public class GoblinBushwhackerTest extends CardTestPlayerBase {
+
+    /**
+     * Tests doesn't work in library and in hand
+     */
+    @Test
+    public void testDoesntWorkFromHand() {
+        addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains");
+        addCard(Constants.Zone.HAND, playerA, "Elite Vanguard");
+        addCard(Constants.Zone.BATTLEFIELD, playerA, "Goblin Bushwhacker");
+        addCard(Constants.Zone.LIBRARY, playerA, "Goblin Bushwhacker");
+        addCard(Constants.Zone.GRAVEYARD, playerA, "Goblin Bushwhacker");
+
+        castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard");
+
+        setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, "Elite Vanguard", 1);
+        assertPowerToughness(playerA, "Elite Vanguard", 2, 1);
+    }
+
+}
\ No newline at end of file