diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.form b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.form
index d0636653fdf..29ff31da77c 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.form
+++ b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.form
@@ -106,10 +106,10 @@
               <EmptySpace min="-2" max="-2" attributes="0"/>
               <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
               <EmptySpace min="-2" max="-2" attributes="0"/>
-              <Component id="pnlPacks" pref="64" max="32767" attributes="0"/>
+              <Component id="pnlPacks" pref="66" max="32767" attributes="0"/>
               <EmptySpace min="-2" pref="11" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="spnNumPlayers" alignment="0" pref="27" max="32767" attributes="1"/>
+                  <Component id="spnNumPlayers" alignment="0" pref="29" max="32767" attributes="1"/>
                   <Component id="pnlDraftOptions" max="32767" attributes="1"/>
                   <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
               </Group>
diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
index 9132f6100cb..98817d51501 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
@@ -43,6 +43,8 @@ import javax.swing.JOptionPane;
 import javax.swing.SpinnerNumberModel;
 import mage.cards.ExpansionSet;
 import mage.cards.Sets;
+import mage.cards.repository.ExpansionInfo;
+import mage.cards.repository.ExpansionRepository;
 import mage.client.MageFrame;
 import mage.client.table.TournamentPlayerPanel;
 import mage.constants.MatchTimeLimit;
@@ -360,7 +362,7 @@ public class NewTournamentDialog extends MageDialog {
             }
             tOptions.getLimitedOptions().setConstructionTime((Integer)this.spnConstructTime.getValue() * 60);
             for (JComboBox pack: packs) {
-                tOptions.getLimitedOptions().getSetCodes().add(((ExpansionSet) pack.getSelectedItem()).getCode());
+                tOptions.getLimitedOptions().getSetCodes().add(((ExpansionInfo) pack.getSelectedItem()).getCode());
             }
         }
         tOptions.getMatchOptions().setMatchTimeLimit((MatchTimeLimit) this.cbTimeLimit.getSelectedItem());
@@ -431,7 +433,7 @@ public class NewTournamentDialog extends MageDialog {
         }
         while (packs.size() < numPacks) {
             JComboBox pack = new JComboBox();
-            pack.setModel(new DefaultComboBoxModel(Sets.getInstance().getWithBoosterSortedByReleaseDate()));
+            pack.setModel(new DefaultComboBoxModel(ExpansionRepository.instance.getWithBoostersSortedByReleaseDate()));
             pnlPacks.add(pack);
             packs.add(pack);
             pack.addActionListener(new java.awt.event.ActionListener() {