diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java
index b6f149ba6d..1278c9b651 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java
@@ -29,16 +29,16 @@ package mage.sets.championsofkamigawa;
 
 import java.util.List;
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.Cards;
 import mage.cards.CardsImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.game.Game;
 import mage.players.Player;
@@ -130,13 +130,13 @@ class GiftsUngivenEffect extends OneShotEffect {
                 for (UUID cardId : cards) {
                     Card card = game.getCard(cardId);
                     if (card != null) {
-                        card.moveToZone(Zone.GRAVEYARD, source.getSourceId(), game, true);
+                        player.moveCardToGraveyardWithInfo(card, source.getSourceId(), game, Zone.LIBRARY);
                     }
                 }
                 for (UUID cardId : cardsToKeep) {
                     Card card = game.getCard(cardId);
                     if (card != null) {
-                        card.moveToZone(Zone.HAND, source.getSourceId(), game, true);
+                        player.moveCardToHandWithInfo(card, source.getSourceId(), game, Zone.LIBRARY);
                     }
                 }
             }
diff --git a/Mage/src/mage/target/common/TargetCardInLibrary.java b/Mage/src/mage/target/common/TargetCardInLibrary.java
index 1f9793e214..a352d7320f 100644
--- a/Mage/src/mage/target/common/TargetCardInLibrary.java
+++ b/Mage/src/mage/target/common/TargetCardInLibrary.java
@@ -65,7 +65,7 @@ public class TargetCardInLibrary extends TargetCard {
 
     public TargetCardInLibrary(int minNumTargets, int maxNumTargets, FilterCard filter) {
         super(minNumTargets, maxNumTargets, Zone.LIBRARY, filter);
-        this.setRequired(!filter.hasPredicates());
+        this.setRequired(minNumTargets > 0 && !filter.hasPredicates());
         this.librarySearchLimit = Integer.MAX_VALUE;
     }