diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java
index 99e2264b..bb1d4333 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java
@@ -294,12 +294,16 @@ public void received(ChoosePieceStateMessage msg){
 
     @Override
     public void received(DrawCardMessage msg){
-        switch (msg.getCard()) {
-            case HiddenCard hiddenCard -> logic.addNotification(new DrawCardNotification(logic.getGame().getActiveColor(), BonusCard.HIDDEN));
-            case TurboCard turboCard -> logic.addNotification(new AcquireCardNotification(BonusCard.TURBO));
-            case ShieldCard shieldCard -> logic.addNotification(new AcquireCardNotification(BonusCard.SHIELD));
-            case SwapCard swapCard -> logic.addNotification(new AcquireCardNotification(BonusCard.SWAP));
-            case null, default -> throw new RuntimeException();
+        if(msg.getCard() instanceof HiddenCard){
+            logic.addNotification(new DrawCardNotification(logic.getGame().getActiveColor(), BonusCard.HIDDEN));
+        } else if(msg.getCard() instanceof TurboCard) {
+            logic.addNotification(new AcquireCardNotification(BonusCard.TURBO));
+        } else if(msg.getCard() instanceof ShieldCard) {
+            logic.addNotification(new AcquireCardNotification(BonusCard.SHIELD));
+        } else if(msg.getCard() instanceof SwapCard) {
+            logic.addNotification(new AcquireCardNotification(BonusCard.SWAP));
+        } else {
+            throw new RuntimeException();
         }
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java
index eec65ac0..61967276 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java
@@ -151,6 +151,7 @@ public void received(ChoosePieceStateMessage msg){
 
     @Override
     public void received(DrawCardMessage msg){
+
     }
 
     public ChoosePieceState getChoosePiece() {