diff --git a/src/server/BaseGame.java b/src/server/BaseGame.java
index b7e2a67..4e0c5b4 100644
--- a/src/server/BaseGame.java
+++ b/src/server/BaseGame.java
@@ -73,7 +73,9 @@
 	}
 	
 	protected void init(){
+		createDeck(); 
 		createHistory();
+		createTrash();
 		CARDS_PER_PLAYER = (nrOfPlayers <= 3) ? 5 : 4;
 		hints = MAX_HINTS;
 		flashs = 0;
diff --git a/src/server/ClientGame.java b/src/server/ClientGame.java
index 01ef17d..4e3bd48 100644
--- a/src/server/ClientGame.java
+++ b/src/server/ClientGame.java
@@ -73,6 +73,8 @@
 	
 	@Override
 	protected void init() {
+		loadOptions();
+		loadFont();
 		super.init();
 	}
 	@Override
@@ -242,11 +244,6 @@
 			Log("received update");
 			if(!initGameReceived){
 				Log("first update!");
-				// TODO move createXY() somewhere else?
-				createDeck();
-				createTrash();
-				loadOptions();
-				loadFont();
 				init();
 				updateGame(jo);
 				createUI();