diff --git a/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java b/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java
index d03992b2eb0..0a54026f17a 100644
--- a/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java
+++ b/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java
@@ -5,6 +5,7 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.AttachedAttackingCondition;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.decorator.ConditionalRequirementEffect;
 import mage.abilities.effects.common.combat.MustBeBlockedByAtLeastOneAttachedEffect;
 import mage.abilities.effects.common.continuous.BoostEquippedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
@@ -50,7 +51,7 @@ public final class AcesBaseballBat extends CardImpl {
                 new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT),
                 AttachedAttackingCondition.instance, "as long as equipped creature is attacking, it has first strike"
         ));
-        ability.addEffect(new ConditionalContinuousEffect(
+        ability.addEffect(new ConditionalRequirementEffect(
                 new MustBeBlockedByAtLeastOneAttachedEffect(filterDalek),
                 AttachedAttackingCondition.instance, "and must be blocked by a Dalek if able"
         ));
diff --git a/Mage.Sets/src/mage/cards/t/TheMasamune.java b/Mage.Sets/src/mage/cards/t/TheMasamune.java
index ecc00cdaead..7237e07ad1e 100644
--- a/Mage.Sets/src/mage/cards/t/TheMasamune.java
+++ b/Mage.Sets/src/mage/cards/t/TheMasamune.java
@@ -4,6 +4,7 @@ import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.AttachedAttackingCondition;
 import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.decorator.ConditionalRequirementEffect;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.abilities.effects.common.combat.MustBeBlockedByAtLeastOneAttachedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
@@ -38,7 +39,7 @@ public final class TheMasamune extends CardImpl {
                 new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT),
                 AttachedAttackingCondition.instance, "as long as equipped creature is attacking, it has first strike"
         ));
-        ability.addEffect(new ConditionalContinuousEffect(
+        ability.addEffect(new ConditionalRequirementEffect(
                 new MustBeBlockedByAtLeastOneAttachedEffect(),
                 AttachedAttackingCondition.instance, "and must be blocked if able"
         ));