diff --git a/Mage.Sets/src/mage/cards/a/AssembledAlphas.java b/Mage.Sets/src/mage/cards/a/AssembledAlphas.java
index 1d6ed99c2d..0e27429caa 100644
--- a/Mage.Sets/src/mage/cards/a/AssembledAlphas.java
+++ b/Mage.Sets/src/mage/cards/a/AssembledAlphas.java
@@ -38,6 +38,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
+import mage.filter.StaticFilters;
 
 /**
  *
@@ -52,7 +53,9 @@ public class AssembledAlphas extends CardImpl {
         this.toughness = new MageInt(5);
 
         // Whenever Assembled Alphas blocks or becomes blocked by a creature, Assembled Alphas deals 3 damage to that creature and 3 damage to that creature's controller.
-        Ability ability = new BlocksOrBecomesBlockedTriggeredAbility(new DamageTargetEffect(3, true, "that creature"), false);
+        Ability ability = new BlocksOrBecomesBlockedTriggeredAbility(
+                new DamageTargetEffect(3, true, "that creature"), StaticFilters.FILTER_PERMANENT_CREATURE, false, null, true);
+
         Effect effect = new DamageTargetControllerEffect(3);
         effect.setText("and 3 damage to that creature's controller");
         ability.addEffect(effect);
diff --git a/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java
index 94b871001d..dc0262bab6 100644
--- a/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java
@@ -85,9 +85,7 @@ public class BlocksOrBecomesBlockedTriggeredAbility extends TriggeredAbilityImpl
             Permanent blocked = game.getPermanent(event.getTargetId());
             if (blocked != null && filter.match(blocked, game)) {
                 if (setTargetPointer) {
-                    for (Effect effect : this.getEffects()) {
-                        effect.setTargetPointer(new FixedTarget(event.getTargetId()));
-                    }
+                    this.getEffects().setTargetPointer(new FixedTarget(event.getTargetId()));
                 }
                 return true;
             }
@@ -96,9 +94,7 @@ public class BlocksOrBecomesBlockedTriggeredAbility extends TriggeredAbilityImpl
             Permanent blocker = game.getPermanent(event.getSourceId());
             if (blocker != null && filter.match(blocker, game)) {
                 if (setTargetPointer) {
-                    for (Effect effect : this.getEffects()) {
-                        effect.setTargetPointer(new FixedTarget(event.getSourceId()));
-                    }
+                    this.getEffects().setTargetPointer(new FixedTarget(event.getSourceId()));
                 }
                 return true;
             }