diff --git a/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java b/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java
index 5fca1d6777..32249715b4 100644
--- a/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java
+++ b/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java
@@ -60,7 +60,6 @@ public class BloodcrazedGoblin extends CardImpl<BloodcrazedGoblin> {
 		this.power = new MageInt(2);
 		this.toughness = new MageInt(2);
 
-		this.addWatcher(new BloodcrazedGoblinWatcher());
 		this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodcrazedGoblinEffect()));
 	}
 
@@ -75,29 +74,6 @@ public class BloodcrazedGoblin extends CardImpl<BloodcrazedGoblin> {
 
 }
 
-class BloodcrazedGoblinWatcher extends WatcherImpl<BloodcrazedGoblinWatcher> {
-
-	public BloodcrazedGoblinWatcher() {
-		super("OpponentDamaged");
-	}
-
-	public BloodcrazedGoblinWatcher(final BloodcrazedGoblinWatcher watcher) {
-		super(watcher);
-	}
-
-	@Override
-	public BloodcrazedGoblinWatcher copy() {
-		return new BloodcrazedGoblinWatcher(this);
-	}
-
-	@Override
-	public void watch(GameEvent event, Game game) {
-		if (event.getType() == EventType.DAMAGED_PLAYER && game.getOpponents(controllerId).contains(event.getPlayerId()))
-			condition = true;
-	}
-
-}
-
 class BloodcrazedGoblinEffect extends ReplacementEffectImpl<BloodcrazedGoblinEffect> {
 
 	public BloodcrazedGoblinEffect() {
@@ -127,7 +103,7 @@ class BloodcrazedGoblinEffect extends ReplacementEffectImpl<BloodcrazedGoblinEff
 	@Override
 	public boolean applies(GameEvent event, Ability source, Game game) {
 		if (event.getType() == EventType.DECLARE_ATTACKER && source.getSourceId().equals(event.getSourceId())) {
-			Watcher watcher = game.getState().getWatchers().get(source.getControllerId(), "OpponentDamaged");
+			Watcher watcher = game.getState().getWatchers().get(source.getControllerId(), "DamagedOpponents");
 			if (watcher != null)
 				return !watcher.conditionMet();
 		}