diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
index 07878fc86..a45a9bda8 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
@@ -1130,6 +1130,12 @@ public final class SWF implements SWFContainerItem, Timelined {
             }
         }
 
+        if (Configuration.autoRenameIdentifiers.get()) {
+            deobfuscateIdentifiers(RenameType.TYPENUMBER);
+            assignClassesToSymbols();
+            clearScriptCache();
+        }
+
         getASMs(true); // Add scriptNames to ASMs
     }
 
diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index 849d34918..65f94ae6a 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -187,7 +187,21 @@ public class CommandLineArgumentParser {
         Configuration.internalFlashViewer,
         Configuration.autoDeobfuscate,
         Configuration.cacheOnDisk,
-        Configuration.overwriteExistingFiles
+        Configuration.cacheImages,
+        Configuration.overwriteExistingFiles,
+        Configuration.autoRenameIdentifiers,
+        Configuration.decimalAddress,
+        Configuration.showAllAddresses,
+        Configuration.smartNumberFormatting,
+        Configuration.enableScriptInitializerDisplay,
+        Configuration.resolveConstants,
+        Configuration.textExportSingleFile,
+        Configuration.scriptExportSingleFile,
+        Configuration.packJavaScripts,
+        Configuration.showMethodBodyId,
+        Configuration.getLocalNamesFromDebugInfo,
+        Configuration.ignoreCLikePackages,
+        Configuration.shapeImportUseNonSmoothedFill
     };
 
     public static boolean isCommandLineMode() {
diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index 8daf041c4..ac584586d 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -764,24 +764,6 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
 
         previewPanel.clear();
 
-        for (SWF swf : newSwfs) {
-
-            if (Configuration.autoRenameIdentifiers.get()) {
-                try {
-                    swf.deobfuscateIdentifiers(RenameType.TYPENUMBER);
-                    swf.assignClassesToSymbols();
-                    swf.clearScriptCache();
-                    if (abcPanel != null) {
-                        abcPanel.reload();
-                    }
-
-                    updateClassesList();
-                } catch (InterruptedException ex) {
-                    logger.log(Level.SEVERE, null, ex);
-                }
-            }
-        }
-
         swfs.add(newSwfs);
         SWF swf = newSwfs.size() > 0 ? newSwfs.get(0) : null;
         if (swf != null) {