diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java
index 633072e961c..b1749dfe8c1 100644
--- a/forge-game/src/main/java/forge/game/GameFormat.java
+++ b/forge-game/src/main/java/forge/game/GameFormat.java
@@ -468,6 +468,19 @@ public class GameFormat implements Comparable<GameFormat> {
             return coreList;
         }
 
+        public Iterable<GameFormat> getBlockList() {
+            List<GameFormat> blockFormats = new ArrayList<>();
+            for (GameFormat format : this.getHistoricList()){
+                if (format.getFormatSubType() != GameFormat.FormatSubType.BLOCK)
+                    continue;
+                if (!format.getName().endsWith("Block"))
+                    continue;
+                blockFormats.add(format);
+            }
+            Collections.sort(blockFormats);  // GameFormat will be sorted by Index!
+            return blockFormats;
+        }
+
         public Map<String, List<GameFormat>> getHistoricMap() {
             Map<String, List<GameFormat>> coreList = new HashMap<>();
             for (GameFormat format: naturallyOrdered){
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
index 538ebe2e5c8..bec725da997 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
@@ -233,7 +233,7 @@ public class CardManager extends ItemManager<PaperCard> {
 
         if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_HISTORIC_FORMATS)) {
             JMenu blocks = GuiUtils.createMenu(localizer.getMessage("lblBlock"));
-            final List<GameFormat> blockFormats = FModel.getBlockFormats();
+            final Iterable<GameFormat> blockFormats = FModel.getFormats().getBlockList();
             for (final GameFormat f : blockFormats) {
                 GuiUtils.addMenuItem(blocks, f.getName(), null, new Runnable() {
                     @Override
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
index 553b1d769b1..5ac44c6ca3a 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
@@ -281,7 +281,7 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
 
         if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_HISTORIC_FORMATS)) {
             JMenu blocks = GuiUtils.createMenu(localizer.getMessage("lblBlock"));
-            final List<GameFormat> blockFormats = FModel.getBlockFormats();
+            final Iterable<GameFormat> blockFormats = FModel.getFormats().getBlockList();
             for (final GameFormat f : blockFormats) {
                 GuiUtils.addMenuItem(blocks, f.getName(), null, new Runnable() {
                     @Override
diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java
index 4fce49b27bd..3b1fbfa3529 100644
--- a/forge-gui/src/main/java/forge/model/FModel.java
+++ b/forge-gui/src/main/java/forge/model/FModel.java
@@ -463,19 +463,6 @@ public final class FModel {
         return blocks;
     }
 
-    public static List<GameFormat> getBlockFormats(){
-        List<GameFormat> blockFormats = new ArrayList<>();
-        for (GameFormat format : FModel.getFormats().getHistoricList()){
-            if (format.getFormatSubType() != GameFormat.FormatSubType.BLOCK)
-                continue;
-            if (!format.getName().endsWith("Block"))
-                continue;
-            blockFormats.add(format);
-        }
-        Collections.sort(blockFormats);  // GameFormat will be sorted by Index!
-        return blockFormats;
-    }
-
     public static QuestPreferences getQuestPreferences() {
         return questPreferences;
     }