diff --git a/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java b/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java
index 6e9e6fb1766..c28565c4edc 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java
@@ -74,7 +74,7 @@ public class GideonChampionOfJustice extends CardImpl {
         this.addAbility(ability1);
 
         // 0: Until end of turn, Gideon becomes an indestructible Human Soldier creature with power and toughness each equal to the number of loyalty counters on him. He's still a planeswalker. Prevent all damage that would be dealt to him this turn.
-        LoyaltyAbility ability2 = new LoyaltyAbility(new BecomesCreatureSourceEffect(new GideonChampionOfJusticeToken(), "planeswalker", Duration.EndOfTurn, false, true), 0);
+        LoyaltyAbility ability2 = new LoyaltyAbility(new BecomesCreatureSourceEffect(new GideonChampionOfJusticeToken(), "planeswalker", Duration.EndOfTurn, false, false), 0);
         ability2.addEffect(new PreventAllDamageToSourceEffect(Duration.EndOfTurn));
         this.addAbility(ability2);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java
index 850f102ffb5..4518ae54d70 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java
@@ -75,5 +75,31 @@ public class GideonTest extends CardTestPlayerBase {
         assertPermanentCount(playerB, "Silvercoat Lion", 1);
         assertAbility(playerB, "Silvercoat Lion", IndestructibleAbility.getInstance(), false);
     }
+    
+    /*
+     * Reported bug: When Gideon, Champion of Justice uses his +0 ability to become a creature,
+     * he is immediately sent to the grave instead.
+    */
+    @Test
+    public void testGideonChampionOfJusticeSecondAbility() {
+        
+        /*
+        Gideon, Champion of Justice {2}{W}{W} - 4 Loyalty
+        0: Until end of turn, Gideon, Champion of Justice becomes a Human Soldier creature with power and toughness 
+        each equal to the number of loyalty counters on him and gains indestructible. He's still a planeswalker. 
+        Prevent all damage that would be dealt to him this turn.
+        */
+        addCard(Zone.BATTLEFIELD, playerA, "Gideon, Champion of Justice", 1);
+        
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+0: Until end of turn");
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+        
+        assertGraveyardCount(playerA, "Gideon, Champion of Justice", 0);
+        assertPermanentCount(playerA, "Gideon, Champion of Justice", 1);
+        assertPowerToughness(playerA, "Gideon, Champion of Justice", 4, 4);
+        assertCounterCount(playerA, "Gideon, Champion of Justice", CounterType.LOYALTY, 4);
+        
+    }
 
 }