diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
index f265f37c917..efa0d5eaca3 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
@@ -377,6 +377,8 @@ public class PlayerPanel extends FContainer {
     private void onIsAiChanged(boolean isAi) {
         deckChooser.setIsAi(isAi);
         lstCommanderDecks.setIsAi(isAi);
+        lstTinyLeadersDecks.setIsAi(isAi);
+        lstBrawlDecks.setIsAi(isAi);
         lstPlanarDecks.setIsAi(isAi);
         lstSchemeDecks.setIsAi(isAi);
         lstVanguardAvatars.setIsAi(isAi);
diff --git a/forge-gui/src/main/java/forge/limited/CardThemedCommanderDeckBuilder.java b/forge-gui/src/main/java/forge/limited/CardThemedCommanderDeckBuilder.java
index a08992016a5..ecd7052557e 100644
--- a/forge-gui/src/main/java/forge/limited/CardThemedCommanderDeckBuilder.java
+++ b/forge-gui/src/main/java/forge/limited/CardThemedCommanderDeckBuilder.java
@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
 import forge.card.CardRulesPredicates;
 import forge.card.ColorSet;
 import forge.deck.DeckFormat;
+import forge.deck.generation.DeckGenPool;
 import forge.item.PaperCard;
 import forge.model.FModel;
 
@@ -17,7 +18,7 @@ import java.util.List;
 public class CardThemedCommanderDeckBuilder extends CardThemedDeckBuilder {
 
     public CardThemedCommanderDeckBuilder(PaperCard commanderCard0, PaperCard partner0, final List<PaperCard> dList, boolean isForAI, DeckFormat format) {
-        super(FModel.getMagicDb().getCommonCards(), format);
+        super(new DeckGenPool(FModel.getMagicDb().getCommonCards().getUniqueCards()), format);
         this.availableList = dList;
         keyCard = commanderCard0;
         secondKeyCard = partner0;
diff --git a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
index de75375989b..8e53abbd8c3 100644
--- a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
+++ b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
@@ -76,7 +76,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
      *            Cards to build the deck from.
      */
     public CardThemedDeckBuilder(PaperCard keyCard0, PaperCard secondKeyCard0, final List<PaperCard> dList, GameFormat format, boolean isForAI) {
-        super(FModel.getMagicDb().getCommonCards(), DeckFormat.Constructed, format.getFilterPrinted());
+        super(new DeckGenPool(FModel.getMagicDb().getCommonCards().getUniqueCards()), DeckFormat.Constructed, format.getFilterPrinted());
         this.availableList = dList;
         keyCard=keyCard0;
         secondKeyCard=secondKeyCard0;