diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java
index 7861824af5d..1276cfe18ef 100644
--- a/src/main/java/forge/Player.java
+++ b/src/main/java/forge/Player.java
@@ -876,7 +876,8 @@ public abstract class Player extends GameEntity {
      * @param player a {@link forge.Player} object.
      */
     public CardList getCardsIn(final Constant.Zone zone) {
-        return new CardList(getZone(zone).getCards());
+        Card[] cards = zone == Zone.Stack ? AllZone.getStackZone().getCards() : getZone(zone).getCards();
+        return new CardList(cards);
     }
     
     /**