diff --git a/src/main/java/forge/StaticEffects.java b/src/main/java/forge/StaticEffects.java
index 06fdd6e8eed..1a88e365898 100644
--- a/src/main/java/forge/StaticEffects.java
+++ b/src/main/java/forge/StaticEffects.java
@@ -160,7 +160,7 @@ public class StaticEffects {
         // modify players
         for (final Player p : affectedPlayers) {
             p.setUnlimitedHandSize(false);
-            p.setMaxHandSize(7);
+            p.setMaxHandSize(p.getStartingHandSize());
 
             if (params.containsKey("AddKeyword")) {
                 addKeywords = params.get("AddKeyword").split(" & ");
diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java
index 4712d5fa178..8772eadd241 100644
--- a/src/main/java/forge/game/GameNew.java
+++ b/src/main/java/forge/game/GameNew.java
@@ -121,7 +121,9 @@ public class GameNew {
         for( Entry<Player, PlayerStartConditions> p : playersConditions.entrySet() ) {
             final Player player = p.getKey();
             player.setStartingLife(p.getValue().getStartingLife());
-            player.setMaxHandSize(p.getValue().getStartingHand());
+            int hand = p.getValue().getStartingHand();
+            player.setMaxHandSize(hand);
+            player.setStartingHandSize(hand);
             // what if I call it for AI player?
             PlayerZone bf = player.getZone(ZoneType.Battlefield);
             Iterable<Card> onTable = p.getValue().getCardsOnBattlefield(); 
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index a4274a090c3..2dc7fa424ae 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -107,6 +107,9 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
 
     /** The max hand size. */
     private int maxHandSize = 7;
+    
+    /** Starting hand size */
+    private int startingHandSize = 7;
 
     /** The unlimited hand size. */
     private boolean unlimitedHandSize = false;
@@ -3019,5 +3022,16 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
 
         return other.getType() != this.getType();
     }
+    
+    
+    public int getStartingHandSize()
+    {
+        return this.startingHandSize;
+    }
+    
+    public void setStartingHandSize(int shs)
+    {
+        this.startingHandSize = shs;
+    }
 
 }