diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EightAndAHalfTailsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EightAndAHalfTailsTest.java
index a540f1869b3..88b0a9758db 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EightAndAHalfTailsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EightAndAHalfTailsTest.java
@@ -31,7 +31,6 @@ import mage.constants.PhaseStep;
 import mage.constants.Zone;
 import mage.game.permanent.Permanent;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
@@ -73,7 +72,6 @@ public class EightAndAHalfTailsTest extends CardTestPlayerBase {
      * recast he was still white.
      */
     @Test
-    @Ignore
     public void testColorChangeIsReset() {
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
 
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
index 94b66f0b86d..6820e727ff4 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
@@ -41,6 +41,8 @@ import mage.constants.Layer;
 import mage.constants.Outcome;
 import mage.constants.SubLayer;
 import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.game.stack.Spell;
 import mage.players.Player;
 
 /**
@@ -106,8 +108,12 @@ public class BecomesColorTargetEffect extends ContinuousEffectImpl {
             for (UUID targetId : targetPointer.getTargets(game, source)) {
                 MageObject targetObject = game.getObject(targetId);
                 if (targetObject != null) {
-                    objectFound = true;
-                    targetObject.getColor(game).setColor(setColor);
+                    if (targetObject instanceof Spell || targetObject instanceof Permanent) {
+                        objectFound = true;
+                        targetObject.getColor(game).setColor(setColor);
+                    } else {
+                        objectFound = false;
+                    }
                 }
             }
             if (!objectFound && this.getDuration() == Duration.Custom) {