diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java
index 343a88240e6..b5970550a0a 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java
@@ -92,7 +92,7 @@ public class StaticAbilityCantAttackBlock {
     }
 
     /**
-     * returns true if attacker can be blocked by blocker
+     * returns true if attacker can't be blocked by blocker
      * @param stAb
      * @param attacker
      * @param blocker
@@ -104,9 +104,10 @@ public class StaticAbilityCantAttackBlock {
             return false;
         }
         if (stAb.hasParam("ValidBlocker")) {
+            boolean stillblock = true;
             for (final String v : stAb.getParam("ValidBlocker").split(",")) {
                 if (blocker.isValid(v, host.getController(), host, stAb)) {
-                    boolean stillblock = false;
+                    stillblock = false;
                     //Dragon Hunter check
                     if (v.contains("withoutReach") && blocker.hasStartOfKeyword("IfReach")) {
                         for (KeywordInterface inst : blocker.getKeywords()) {
@@ -120,13 +121,14 @@ public class StaticAbilityCantAttackBlock {
                             }
                         }
                     }
-                    if (stillblock) {
-                        return false;
+                    if (!stillblock) {
+                        break;
                     }
-                } else {
-                    return false;
                 }
             }
+            if (stillblock) {
+                return false;
+            }
         }
         // relative valid relative to each other
         if (!stAb.matchesValidParam("ValidAttackerRelative", attacker, blocker)) {
diff --git a/forge-gui/res/cardsfolder/u/unexpected_windfall.txt b/forge-gui/res/cardsfolder/u/unexpected_windfall.txt
index 28dc9c4febf..581b4aba91d 100644
--- a/forge-gui/res/cardsfolder/u/unexpected_windfall.txt
+++ b/forge-gui/res/cardsfolder/u/unexpected_windfall.txt
@@ -1,7 +1,7 @@
 Name:Unexpected Windfall
 ManaCost:2 R R
 Types:Instant
-A:SP$ Draw | Cost$ 3 R Discard<1/Card/card> | CostDesc$ As an additional cost to cast this spell, discard a card. | NumCards$ 2 | Defined$ You | SubAbility$ DBToken | SpellDescription$ Draw two cards and create two Treasure tokens. (They're artifacts with "{T}, Sacrifice this artifact: Add one mana of any color.")
+A:SP$ Draw | Cost$ 2 R R Discard<1/Card/card> | CostDesc$ As an additional cost to cast this spell, discard a card. | NumCards$ 2 | Defined$ You | SubAbility$ DBToken | SpellDescription$ Draw two cards and create two Treasure tokens. | StackDescription$ SpellDescription
 SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
 DeckHas:Ability$Discard
 DeckHints:Keyword$Madness & Ability$Delirium