diff --git a/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java b/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java
index 21b0e0b246f..59159958e67 100644
--- a/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java
+++ b/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java
@@ -28,6 +28,8 @@
 package mage.sets.darkascension;
 
 import java.util.UUID;
+import mage.abilities.condition.FixedCondition;
+import mage.abilities.condition.LockedInCondition;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
@@ -54,7 +56,7 @@ public class TragicSlip extends CardImpl<TragicSlip> {
         this.getSpellAbility().addEffect(new ConditionalContinousEffect(
                 new BoostTargetEffect(-13, -13, Duration.EndOfTurn),
                 new BoostTargetEffect(-1, -1, Duration.EndOfTurn),
-                MorbidCondition.getInstance(),
+                new LockedInCondition(MorbidCondition.getInstance()),
                 "Target creature gets -1/-1 until end of turn. Morbid - That creature gets -13/-13 until end of turn instead if a creature died this turn",
                 true));
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/WardenOfTheWallTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/WardenOfTheWallTest.java
index 68e2de3b723..2feb6c5e644 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/WardenOfTheWallTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/WardenOfTheWallTest.java
@@ -13,6 +13,13 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
  */
 public class WardenOfTheWallTest extends CardTestPlayerBase {
 
+    /*
+     * Warden of the Wall
+     *   Warden of the Wall enters the battlefield tapped.
+     *   {T}: Add {1} to your mana pool.
+     *   As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying.
+     *
+     */
     @Test
     public void testCard() {
         addCard(Zone.BATTLEFIELD, playerA, "Warden of the Wall");
diff --git a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
index 9d3bd0fe81e..03bf055e843 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
@@ -22,6 +22,7 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl<Conditional
     protected ContinuousEffect otherwiseEffect;
     protected Condition condition;
     protected boolean lockedInCondition;
+    protected boolean initDone = false;
 
     public ConditionalContinousEffect(ContinuousEffect effect, Condition condition, String text) {
         this(effect, null, condition, text);
@@ -64,11 +65,12 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl<Conditional
     public ConditionalContinousEffect(final ConditionalContinousEffect effect) {
         super(effect);
         this.effect = (ContinuousEffect) effect.effect.copy();
-        if (otherwiseEffect != null) {
+        if (effect.otherwiseEffect != null) {
             this.otherwiseEffect = (ContinuousEffect) effect.otherwiseEffect.copy();
         }
         this.condition = effect.condition;
         this.lockedInCondition = effect.lockedInCondition;
+        this.initDone = effect.initDone;
     }
 
     @Override
@@ -82,18 +84,22 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl<Conditional
             condition = new FixedCondition(condition.apply(game, source));
         }
         effect.init(source, game);
+        effect.setTargetPointer(this.targetPointer);
         if (otherwiseEffect != null) {
+            otherwiseEffect.setTargetPointer(this.targetPointer);
             otherwiseEffect.init(source, game);
         }
+        initDone = true;
     }
 
     @Override
     public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
+        if (!initDone) { // if simpleStaticAbility, init won't be called
+            init(source, game);
+        }
         if (condition.apply(game, source)) {
-            effect.setTargetPointer(this.targetPointer);
             return effect.apply(layer, sublayer, source, game);
         } else if (otherwiseEffect != null) {
-            otherwiseEffect.setTargetPointer(this.targetPointer);
             return otherwiseEffect.apply(layer, sublayer, source, game);
         }
         if (!condition.apply(game, source) && effect.getDuration() == Duration.OneUse) {
@@ -107,9 +113,6 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl<Conditional
 
     @Override
     public boolean apply(Game game, Ability source) {
-        if (lockedInCondition && !(condition instanceof FixedCondition)) {
-            condition = new FixedCondition(condition.apply(game, source));
-        }
         if (condition.apply(game, source)) {
             effect.setTargetPointer(this.targetPointer);
             return effect.apply(game, source);
@@ -120,6 +123,9 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl<Conditional
         if (!condition.apply(game, source) && effect.getDuration() == Duration.OneUse) {
             used = true;
         }
+        if (!condition.apply(game, source) && effect.getDuration() == Duration.Custom) {
+            this.discard();
+        }
         return false;
     }