diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 7d98481920..745c3e012c 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -172,9 +172,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
         setTitle("XMage, version " + version);
         clientId = UUID.randomUUID();
-        // Workaround for #451
-        System.setProperty("java.util.Arrays.useLegacyMergeSort", "true");
-        
         EDTExceptionHandler.registerExceptionHandler();
         addWindowListener(new WindowAdapter() {
             @Override
@@ -1091,9 +1088,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
      * @param args the command line arguments
      */
     public static void main(final String args[]) {
+         // Workaround for #451
+        System.setProperty("java.util.Arrays.useLegacyMergeSort", "true");
 
         startTime = System.currentTimeMillis();
-
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
             @Override
             public void uncaughtException(Thread t, Throwable e) {