diff --git a/src/main/java/forge/game/ai/AiInputBlock.java b/src/main/java/forge/game/ai/AiInputBlock.java
index df1456636c5..2dfebb1931f 100644
--- a/src/main/java/forge/game/ai/AiInputBlock.java
+++ b/src/main/java/forge/game/ai/AiInputBlock.java
@@ -36,6 +36,6 @@ public class AiInputBlock extends InputBase {
         game.getPhaseHandler().setPlayersPriorityPermission(false);
         
         // was not added to stack, so will be replaced by plain update
-        Singletons.getControl().getMatch().getCurrentGame().getInputQueue().updateObservers();
+        game.getInputQueue().updateObservers();
     }
 }
diff --git a/src/main/java/forge/gui/match/controllers/CDock.java b/src/main/java/forge/gui/match/controllers/CDock.java
index 2e284737aac..5fd3bcdd43f 100644
--- a/src/main/java/forge/gui/match/controllers/CDock.java
+++ b/src/main/java/forge/gui/match/controllers/CDock.java
@@ -149,7 +149,7 @@ public enum CDock implements ICDoc {
      * View deck list.
      */
     private void viewDeckList() {
-        showDeck(Singletons.getControl().getMatch().getPlayersDeck(player.getLobbyPlayer()));
+        showDeck(player.getGame().getMatch().getPlayersDeck(player.getLobbyPlayer()));
     }
 
     /**