diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java b/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java
index 23e1bcc6bdd..6453ca233bb 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java
@@ -25,15 +25,14 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.sets.dragonsmaze;
 
 import java.util.UUID;
 import mage.MageInt;
-import mage.abilities.Ability;
+import mage.abilities.TriggeredAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.condition.common.CastFromHandCondition;
-import mage.abilities.decorator.ConditionalOneShotEffect;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.PopulateEffect;
 import mage.cards.CardImpl;
@@ -46,11 +45,9 @@ import mage.watchers.common.CastFromHandWatcher;
  *
  * @author LevelX2
  */
-
-
 public class ScionOfVituGhazi extends CardImpl {
 
-    public ScionOfVituGhazi (UUID ownerId) {
+    public ScionOfVituGhazi(UUID ownerId) {
         super(ownerId, 7, "Scion of Vitu-Ghazi", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}");
         this.expansionSetCode = "DGM";
         this.subtype.add("Elemental");
@@ -58,15 +55,13 @@ public class ScionOfVituGhazi extends CardImpl {
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
 
-        // When Scion of Vitu-Ghazi enters the battlefield, if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield, then populate.
-        Ability ability = new EntersBattlefieldTriggeredAbility(
-                new ConditionalOneShotEffect(new CreateTokenEffect(new BirdToken()), new CastFromHandCondition(),
-                "if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield,"));
+        TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BirdToken()), false);
         ability.addEffect(new PopulateEffect("then"));
-        this.addAbility(ability, new CastFromHandWatcher());
+        this.addAbility(new ConditionalTriggeredAbility(ability, new CastFromHandCondition(),
+                "When {this} enters the battlefield, if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield, then populate."), new CastFromHandWatcher());
     }
 
-    public ScionOfVituGhazi (final ScionOfVituGhazi card) {
+    public ScionOfVituGhazi(final ScionOfVituGhazi card) {
         super(card);
     }
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java
index d6950d92b97..4f4fc2a62d1 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java
@@ -95,4 +95,40 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
         assertLife(playerB, 17);
     }
 
+    /**
+     * Scion of Vitu-Ghazi if it is NOT cast from the hand, it will still allow
+     * the Populate effect. It should only allow these when it is cast from
+     * hand.
+     *
+     */
+    @Test
+    public void testScionOfVituGhaziConditionNotTrue() {
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 4);
+        // When Scion of Vitu-Ghazi enters the battlefield, if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield, then populate.
+        addCard(Zone.HAND, playerA, "Scion of Vitu-Ghazi", 1); // 4/4 - {3}{W}{W}
+        // Put target creature card from a graveyard onto the battlefield under your control. You lose life equal to its converted mana cost.
+        addCard(Zone.HAND, playerA, "Reanimate", 1); // {B}
+
+        addCard(Zone.BATTLEFIELD, playerB, "Swamp", 2);
+        // Destroy target nonartifact, nonblack creature. It can't be regenerated.
+        addCard(Zone.HAND, playerB, "Terror", 1); // {1}{B}
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Scion of Vitu-Ghazi");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Terror", "Scion of Vitu-Ghazi");
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Reanimate", "Scion of Vitu-Ghazi");
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertGraveyardCount(playerB, "Terror", 1);
+
+        assertGraveyardCount(playerA, "Reanimate", 1);
+        assertPermanentCount(playerA, "Scion of Vitu-Ghazi", 1);
+        assertPermanentCount(playerA, "Bird", 2); // only 2 from cast from hand creation and populate. Populate may not trigger from reanimate
+
+        assertLife(playerA, 15);
+        assertLife(playerB, 20);
+    }
+
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java
index c2b7d005da6..1eb5026f2b4 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java
@@ -1,16 +1,16 @@
 /*
  *  Copyright 2011 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
@@ -20,7 +20,7 @@
  *  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.
@@ -37,36 +37,28 @@ import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.filter.predicate.permanent.TokenPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.PermanentToken;
-import mage.game.permanent.token.Token;
 import mage.players.Player;
 import mage.target.Target;
 import mage.target.TargetPermanent;
 import mage.target.targetpointer.FixedTarget;
-import mage.util.CardUtil;
-
-
 
 /**
  *
  * @author LevelX2
  */
-
 //
 //    701.27. Populate
 //
-//    701.27a To populate means to choose a creature token you control and put a 
+//    701.27a To populate means to choose a creature token you control and put a
 //    token onto the battlefield that’s a copy of that creature token.
 //
-//    701.27b If you control no creature tokens when instructed to populate, you 
+//    701.27b If you control no creature tokens when instructed to populate, you
 //    won’t put a token onto the battlefield.
 //
-
-
 public class PopulateEffect extends OneShotEffect {
 
     private static final FilterPermanent filter = new FilterPermanent("token for populate");
-    
+
     static {
         filter.add(new TokenPredicate());
         filter.add(new ControllerPredicate(TargetController.YOU));
@@ -75,10 +67,10 @@ public class PopulateEffect extends OneShotEffect {
     public PopulateEffect() {
         this("");
     }
-    
+
     public PopulateEffect(String prefixText) {
         super(Outcome.Copy);
-        this.staticText = (prefixText.length()>0?prefixText+" p":"P")+"opulate <i>(Put a token onto the battlefield that's a copy of a creature token you control.)</i>";
+        this.staticText = (prefixText.length() > 0 ? prefixText + " p" : "P") + "opulate <i>(Put a token onto the battlefield that's a copy of a creature token you control.)</i>";
     }
 
     public PopulateEffect(final PopulateEffect effect) {
@@ -94,13 +86,15 @@ public class PopulateEffect extends OneShotEffect {
                 player.choose(Outcome.Copy, target, source.getSourceId(), game);
                 Permanent tokenToCopy = game.getPermanent(target.getFirstTarget());
                 if (tokenToCopy != null) {
-                    if (!game.isSimulation())
+                    if (!game.isSimulation()) {
                         game.informPlayers("Token selected for populate: " + tokenToCopy.getLogName());
+                    }
                     Effect effect = new PutTokenOntoBattlefieldCopyTargetEffect();
                     effect.setTargetPointer(new FixedTarget(target.getFirstTarget()));
                     return effect.apply(game, source);
                 }
             }
+            return true;
         }
         return false;
     }
@@ -109,4 +103,4 @@ public class PopulateEffect extends OneShotEffect {
     public PopulateEffect copy() {
         return new PopulateEffect(this);
     }
-}
\ No newline at end of file
+}