diff --git a/res/cardsfolder/b/bravado.txt b/res/cardsfolder/b/bravado.txt
index 5cf53ab1f25..573045302c2 100644
--- a/res/cardsfolder/b/bravado.txt
+++ b/res/cardsfolder/b/bravado.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ X | AddToughness$ X | Description$ Enchanted creature gets +1/+1 for each other creature you control.
-SVar:X:Count$Valid Creature.YouCtrl/Minus.1
+SVar:X:Count$Valid Creature.NotEnchantedBy+YouCtrl
 SVar:BuffedBy:Creature
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bravado.jpg
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 39f3c8cf18f..d6b15833c9b 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -5043,6 +5043,8 @@ public class Card extends GameEntity implements Comparable<Card> {
             if (!equipping.contains(source) && !source.equals(enchanting)) return false;
         } else if (Property.startsWith("EnchantedBy")) {
             if (!enchantedBy.contains(source)) return false;
+        } else if (Property.startsWith("NotEnchantedBy")) {
+            if (enchantedBy.contains(source)) return false;
         } else if (Property.startsWith("Enchanted")) {
             if (!source.equals(enchanting)) return false;
         } else if (Property.startsWith("EquippedBy")) {
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java
index 1508122c171..f5b76ec5dde 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java
@@ -860,7 +860,7 @@ public final class AbilityFactory_Combat {
             list = list.getValidCards(abTgt.getValidTgts(), source.getController(), source);
             list = list.filter(new CardListFilter() {
                 public boolean addCard(Card c) {
-                    if (!CombatUtil.canBlock(source, c, AllZone.getCombat()))
+                    if (!CombatUtil.canBlock(source, c))
                         return false;
                     if (CombatUtil.canDestroyAttacker(source, c, AllZone.getCombat(), false))
                         return false;