diff --git a/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java b/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java
index 794fcdfab8..8dbc35c3c8 100644
--- a/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java
+++ b/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java
@@ -27,23 +27,22 @@
  */
 package mage.sets.mirage;
 
-import java.util.UUID;
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.ObjectColor;
-import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.condition.Condition;
+import mage.abilities.condition.common.SourceMatchesFilterCondition;
 import mage.abilities.decorator.ConditionalContinousEffect;
 import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
 import mage.abilities.keyword.*;
 import mage.cards.CardImpl;
 import mage.filter.FilterCard;
+import mage.filter.common.FilterAttackingCreature;
 import mage.filter.predicate.mageobject.ColorPredicate;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
+
+import java.util.UUID;
 
 /**
  *
@@ -84,7 +83,7 @@ public class SpiritOfTheNight extends CardImpl<SpiritOfTheNight> {
         this.addAbility(new ProtectionAbility(filter));
         
         // Spirit of the Night has first strike as long as it's attacking.
-        ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new SpiritOfTheNightCondition(), rule);
+        ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new SourceMatchesFilterCondition(new FilterAttackingCreature()), rule);
         this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect));
     }
 
@@ -97,15 +96,3 @@ public class SpiritOfTheNight extends CardImpl<SpiritOfTheNight> {
         return new SpiritOfTheNight(this);
     }
 }
-
-class SpiritOfTheNightCondition implements Condition {
-    
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Permanent spiritOfTheNight = game.getPermanent(source.getSourceId());
-        if (spiritOfTheNight.isAttacking()) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/Mage/src/mage/abilities/condition/common/SourceMatchesFilterCondition.java b/Mage/src/mage/abilities/condition/common/SourceMatchesFilterCondition.java
new file mode 100644
index 0000000000..7aeca178e7
--- /dev/null
+++ b/Mage/src/mage/abilities/condition/common/SourceMatchesFilterCondition.java
@@ -0,0 +1,60 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.abilities.condition.common;
+
+import mage.abilities.Ability;
+import mage.abilities.condition.Condition;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+
+/**
+ * Describes condition when source matches specified filter
+ *
+ * @author magenoxx_at_gmail.com
+ */
+public class SourceMatchesFilterCondition implements Condition {
+
+    private FilterCreaturePermanent filter;
+
+    public SourceMatchesFilterCondition(FilterCreaturePermanent filter) {
+        this.filter = filter;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getBattlefield().getPermanent(source.getSourceId());
+        if (permanent != null) {
+            if (filter.match(permanent, permanent.getId(), permanent.getControllerId(), game)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}