diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java
index 42b6e9c8f4..ba19a176b1 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java
@@ -103,10 +103,7 @@ class TargetStackObjectTargetingControlledPermanent extends TargetObject {
     @Override
     public boolean canTarget(UUID id, Ability source, Game game) {
         StackObject stackObject = game.getStack().getStackObject(id);
-        if ((stackObject instanceof Spell) || (stackObject instanceof StackAbility)) {
-            return true;
-        }
-        return false;
+        return (stackObject instanceof Spell) || (stackObject instanceof StackAbility);
     }
 
     @Override
diff --git a/Mage/src/mage/game/stack/SpellStack.java b/Mage/src/mage/game/stack/SpellStack.java
index f8b9e80b75..cf261770e8 100644
--- a/Mage/src/mage/game/stack/SpellStack.java
+++ b/Mage/src/mage/game/stack/SpellStack.java
@@ -105,6 +105,9 @@ public class SpellStack extends ArrayDeque<StackObject> {
                 counteredObjectName = "Ability (" + stackObject.getStackAbility().getRule(targetSourceName) + ") of " + targetSourceName;
             }
             if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.COUNTER, objectId, sourceId, stackObject.getControllerId()))) {
+                if (!(stackObject instanceof Spell)) { // spells are removed from stack by the card movement
+                    this.remove(stackObject);
+                }
                 stackObject.counter(sourceId, game, zone, owner, onTop);
                 if (!game.isSimulation()) {
                     game.informPlayers(counteredObjectName + " is countered by " + sourceObject.getLogName());