diff --git a/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java b/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java
index dd376b43af..a87a9bfec3 100644
--- a/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java
+++ b/Mage.Sets/src/mage/sets/onslaught/ChainOfVapor.java
@@ -28,6 +28,7 @@
 package mage.sets.onslaught;
 
 import java.util.UUID;
+import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.Mode;
 import mage.abilities.effects.OneShotEffect;
@@ -87,34 +88,31 @@ class ChainOfVaporEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
-        if (controller == null) {
+        MageObject sourceObject = source.getSourceObject(game);
+        if (controller == null || sourceObject == null) {
             return false;
         }
         Permanent permanent = game.getPermanent(source.getFirstTarget());
         if (permanent != null) {
             controller.moveCards(permanent, null, Zone.HAND, source, game);
             Player player = game.getPlayer(permanent.getControllerId());
-            if (player.chooseUse(Outcome.ReturnToHand, "Sacrifice a land to copy this spell?", source, game)) {
-                TargetControlledPermanent target = new TargetControlledPermanent(new FilterControlledLandPermanent());
-                if (player.chooseTarget(Outcome.Sacrifice, target, source, game)) {
-                    Permanent land = game.getPermanent(target.getFirstTarget());
-                    if (land != null) {
-                        if (land.sacrifice(source.getSourceId(), game)) {
-                            Spell spell = game.getStack().getSpell(source.getSourceId());
-                            if (spell != null) {
-                                Spell copy = spell.copySpell();
-                                copy.setControllerId(player.getId());
-                                copy.setCopiedSpell(true);
-                                game.getStack().push(copy);
-                                copy.chooseNewTargets(game, player.getId());
-                                String activateMessage = copy.getActivatedMessage(game);
-                                if (activateMessage.startsWith(" casts ")) {
-                                    activateMessage = activateMessage.substring(6);
-                                }
-                                game.informPlayers(player.getLogName() + " copies " + activateMessage);
-                                return true;
+            TargetControlledPermanent target = new TargetControlledPermanent(0, 1, new FilterControlledLandPermanent("a land to sacrifice (to be able to copy " + sourceObject.getName() + ")"), true);
+            if (player.chooseTarget(Outcome.Sacrifice, target, source, game)) {
+                Permanent land = game.getPermanent(target.getFirstTarget());
+                if (land != null && land.sacrifice(source.getSourceId(), game)) {
+                    if (player.chooseUse(outcome, "Copy the spell?", source, game)) {
+                        Spell spell = game.getStack().getSpell(source.getSourceId());
+                        if (spell != null) {
+                            Spell copy = spell.copySpell();
+                            copy.setControllerId(player.getId());
+                            copy.setCopiedSpell(true);
+                            game.getStack().push(copy);
+                            copy.chooseNewTargets(game, player.getId());
+                            String activateMessage = copy.getActivatedMessage(game);
+                            if (activateMessage.startsWith(" casts ")) {
+                                activateMessage = activateMessage.substring(6);
                             }
-                            return false;
+                            game.informPlayers(player.getLogName() + " " + activateMessage);
                         }
                     }
                 }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java
new file mode 100644
index 0000000000..c9736f2aa0
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java
@@ -0,0 +1,64 @@
+/*
+ *  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 org.mage.test.cards.copy;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class CopySpellTest extends CardTestPlayerBase {
+
+    @Test
+    public void copyChainOfVapor() {
+        // Return target nonland permanent to its owner's hand. Then that permanent's controller may sacrifice a land. If the player does, he or she may copy this spell and may choose a new target for that copy.
+        addCard(Zone.HAND, playerA, "Chain of Vapor", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 1);
+
+        addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Pillarfield Ox", 1);
+        addCard(Zone.BATTLEFIELD, playerB, "Island", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Chain of Vapor", "Pillarfield Ox");
+        setChoice(playerB, "Yes");
+        addTarget(playerB, "Silvercoat Lion");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertGraveyardCount(playerB, "Island", 1);
+        assertHandCount(playerB, "Pillarfield Ox", 1);
+        assertHandCount(playerA, "Silvercoat Lion", 1);
+    }
+
+}
diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
index d40b5113bf..9a966cce28 100644
--- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
+++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
@@ -779,7 +779,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
         FilterCard filter = new FilterCard();
         filter.add(new NamePredicate(cardName));
         int actual = currentGame.getPlayer(player.getId()).getHand().count(filter, player.getId(), currentGame);
-        Assert.assertEquals("(Hand) Card counts for card " + cardName + " are not equal ", count, actual);
+        Assert.assertEquals("(Hand) Card counts for card " + cardName + " for " + player.getName() + " are not equal ", count, actual);
     }
 
     /**
diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java
index 54db7c4463..1ca1527d71 100644
--- a/Mage/src/mage/cards/CardImpl.java
+++ b/Mage/src/mage/cards/CardImpl.java
@@ -365,7 +365,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
                         game.getState().getCommand().remove((Commander) game.getObject(objectId));
                         break;
                     case STACK:
-                        StackObject stackObject = game.getStack().getSpell(getId());
+                        StackObject stackObject = game.getStack().getSpell(getSpellAbility().getId());
                         if (stackObject == null && (this instanceof SplitCard)) { // handle if half of Split cast is on the stack
                             stackObject = game.getStack().getSpell(((SplitCard) this).getLeftHalfCard().getId());
                             if (stackObject == null) {
diff --git a/Mage/src/mage/game/stack/Spell.java b/Mage/src/mage/game/stack/Spell.java
index 3781cd4909..f51d8c3ed1 100644
--- a/Mage/src/mage/game/stack/Spell.java
+++ b/Mage/src/mage/game/stack/Spell.java
@@ -197,9 +197,11 @@ public class Spell extends StackObjImpl implements Card {
                     }
                 }
                 if (game.getState().getZone(card.getMainCard().getId()) == Zone.STACK) {
-                    Player player = game.getPlayer(getControllerId());
-                    if (player != null) {
-                        player.moveCards(card, Zone.STACK, Zone.GRAVEYARD, ability, game);
+                    if (isCopy() == card.isCopy()) {
+                        Player player = game.getPlayer(getControllerId());
+                        if (player != null) {
+                            player.moveCards(card, Zone.STACK, Zone.GRAVEYARD, ability, game);
+                        }
                     }
                 }
                 return result;