diff --git a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
index 9ceffa3033..45e8c70e05 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
@@ -48,8 +48,10 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl<Conditional
     @Override
     public boolean apply(Constants.Layer layer, Constants.SubLayer sublayer, Ability source, Game 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);
         }
         return false;
@@ -58,8 +60,10 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl<Conditional
     @Override
     public boolean apply(Game game, Ability source) {
         if (condition.apply(game, source)) {
+            effect.setTargetPointer(this.targetPointer);
             return effect.apply(game, source);
         } else if (otherwiseEffect != null) {
+            otherwiseEffect.setTargetPointer(this.targetPointer);
             return otherwiseEffect.apply(game, source);
         }
         return false;
diff --git a/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java b/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java
index f739d22b79..31e698885f 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java
@@ -67,8 +67,10 @@ public class ConditionalOneShotEffect extends OneShotEffect<ConditionalOneShotEf
 	@Override
 	public boolean apply(Game game, Ability source) {
 		if (condition.apply(game, source)) {
+			effect.setTargetPointer(this.targetPointer);
 			return effect.apply(game, source);
 		} else if (otherwiseEffect != null) {
+			otherwiseEffect.setTargetPointer(this.targetPointer);
 			return otherwiseEffect.apply(game, source);
 		}
 		return false;
diff --git a/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java b/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java
index a2a5ffefc9..3d75ac1223 100644
--- a/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java
+++ b/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java
@@ -31,6 +31,7 @@ public class DoIfCostPaid extends OneShotEffect<DoIfCostPaid> {
 			if (player.chooseUse(executingEffect.getOutcome(), "Pay " + cost.getText() + " and " + executingEffect.getText(source.getModes().getMode()), game)) {
 				cost.clearPaid();
 				if (cost.pay(source, game, source.getId(), source.getControllerId(), false)) {
+                    executingEffect.setTargetPointer(this.targetPointer);
                     return executingEffect.apply(game, source);
                 }
 			}