diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java
index 59dd6d41ec0..cdd3ec99fd6 100644
--- a/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java
+++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java
@@ -3,7 +3,6 @@ package mage.abilities.decorator;
 import mage.abilities.Ability;
 import mage.abilities.Mode;
 import mage.abilities.condition.Condition;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.Effects;
 import mage.abilities.effects.OneShotEffect;
 import mage.constants.Outcome;
@@ -126,10 +125,11 @@ public class ConditionalOneShotEffect extends OneShotEffect {
     }
 
     @Override
-    public Effect setTargetPointer(TargetPointer targetPointer) {
+    public ConditionalOneShotEffect setTargetPointer(TargetPointer targetPointer) {
         effects.setTargetPointer(targetPointer);
         otherwiseEffects.setTargetPointer(targetPointer);
-        return super.setTargetPointer(targetPointer);
+        super.setTargetPointer(targetPointer);
+        return this;
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java
index fd9ed392471..8812762b3af 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java
@@ -81,8 +81,9 @@ public class CreateDelayedTriggeredAbilityEffect extends OneShotEffect {
     }
 
     @Override
-    public Effect setTargetPointer(TargetPointer targetPointer) {
+    public CreateDelayedTriggeredAbilityEffect setTargetPointer(TargetPointer targetPointer) {
         ability.getEffects().setTargetPointer(targetPointer);
-        return super.setTargetPointer(targetPointer);
+        super.setTargetPointer(targetPointer);
+        return this;
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/RollDieWithResultTableEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RollDieWithResultTableEffect.java
index 762c1838f19..1ec72646208 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/RollDieWithResultTableEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/RollDieWithResultTableEffect.java
@@ -153,10 +153,11 @@ public class RollDieWithResultTableEffect extends OneShotEffect {
     }
 
     @Override
-    public Effect setTargetPointer(TargetPointer targetPointer) {
+    public RollDieWithResultTableEffect setTargetPointer(TargetPointer targetPointer) {
         for (TableEntry tableEntry : resultsTable) {
             tableEntry.effects.setTargetPointer(targetPointer);
         }
-        return super.setTargetPointer(targetPointer);
+        super.setTargetPointer(targetPointer);
+        return this;
     }
 }