diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java
index 6c5b5eac174..b67cd9771f6 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -1484,13 +1484,12 @@ public class CardProperty {
                     if (combat.isBlocking(card, c))
                         return true;
                 return false;
-            }
-            if (what.startsWith("Remembered")) {
-                for (final Object o : source.getRemembered()) {
-                    if (o instanceof Card && combat.isBlocking(card, (Card) o)) {
+            } else {
+                for(Card c : AbilityUtils.getDefinedCards(source, what, spellAbility)) {
+                    if (combat.isBlocking(card, c)) {
                         return true;
                     }
-                }
+                };
                 return false;
             }
         } else if (property.startsWith("sharesBlockingAssignmentWith")) {
diff --git a/forge-gui/res/cardsfolder/upcoming/labyrinth_raptor.txt b/forge-gui/res/cardsfolder/upcoming/labyrinth_raptor.txt
index f1ca9b13459..6e954439615 100755
--- a/forge-gui/res/cardsfolder/upcoming/labyrinth_raptor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/labyrinth_raptor.txt
@@ -4,7 +4,7 @@ Types:Creature Nightmare Dinosaur
 PT:2/2
 K:Menace
 T:Mode$ AttackerBlocked | ValidCard$ Creature.YouCtrl+withMenace | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever a creature you control with menace becomes blocked, defending player sacrifices a creature blocking it.
-SVar:TrigSac:DB$ Sacrifice | Defined$ DefendingPlayer | SacValid$ Creature.blockingSource | Amount$ 1
+SVar:TrigSac:DB$ Sacrifice | Defined$ TriggeredDefendingPlayer | SacValid$ Creature.blockingTriggeredAttacker | Amount$ 1
 A:AB$ PumpAll | Cost$ B R | ValidCards$ Creature.YouCtrl+withMenace | NumAtt$ 1 | SpellDescription$ Creatures you control with menace get +1/+0 until end of turn.
 SVar:PlayMain1:TRUE
 Oracle:Menace\nWhenever a creature you control with menace becomes blocked, defending player sacrifices a creature blocking it.\n{B}{R}: Creatures you control with menace get +1/+0 until end of turn.