diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WheelOfSunAndMoon.java b/Mage.Sets/src/mage/sets/shadowmoor/WheelOfSunAndMoon.java
index e41ad1b214..e67788dccc 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/WheelOfSunAndMoon.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/WheelOfSunAndMoon.java
@@ -85,7 +85,7 @@ public class WheelOfSunAndMoon extends CardImpl {
 class WheelOfSunAndMoonEffect extends ReplacementEffectImpl {
 
     public WheelOfSunAndMoonEffect() {
-        super(Duration.WhileOnBattlefield, Outcome.Damage);
+        super(Duration.WhileOnBattlefield, Outcome.Detriment);
         staticText = "If a card would be put into enchanted player's graveyard from anywhere, instead that card is revealed and put on the bottom of that player's library";
     }
 
@@ -126,10 +126,9 @@ class WheelOfSunAndMoonEffect extends ReplacementEffectImpl {
         if (controller != null && sourceObject != null) {
             Card card = game.getCard(event.getTargetId());
             if (card != null) {
-                ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
                 Cards cards = new CardsImpl(card);
                 controller.revealCards(sourceObject.getIdName(), cards, game);
-                controller.moveCardToLibraryWithInfo(card, source.getSourceId(), game, zEvent.getFromZone(), false, true);
+                controller.putCardsOnBottomOfLibrary(cards, game, source, false);
                 return true;
             }
         }
diff --git a/Mage/src/mage/game/stack/Spell.java b/Mage/src/mage/game/stack/Spell.java
index 2adc38b5e2..3781cd4909 100644
--- a/Mage/src/mage/game/stack/Spell.java
+++ b/Mage/src/mage/game/stack/Spell.java
@@ -636,6 +636,10 @@ public class Spell extends StackObjImpl implements Card {
         if (this.isCopiedSpell() && !zone.equals(Zone.STACK)) {
             return true;
         }
+        Card card = game.getCard(getSourceId());
+        if (card != null) {
+            return card.moveToZone(zone, sourceId, game, flag, appliedEffects);
+        }
         throw new UnsupportedOperationException("Unsupported operation");
     }