diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
index 2b138d447..66bda3a12 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
@@ -194,6 +194,9 @@ public class ScriptPack extends AS3ClassTreeItem {
 
         if (!exportSettings.singleFile) {
             file = getExportFile(directory, exportSettings);
+            if (file.exists() && !Configuration.overwriteExistingFiles.get()) {
+                return file;
+            }
         }
 
         try (FileTextWriter writer = exportSettings.singleFile ? null : new FileTextWriter(Configuration.getCodeFormatting(), new FileOutputStream(file))) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
index d28ebb772..fd9a6f35a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
@@ -145,6 +145,10 @@ public class Configuration {
     @ConfigurationCategory("ui")
     public static final ConfigurationItem<Boolean> useRibbonInterface = null;
 
+    @ConfigurationDefaultBoolean(true)
+    @ConfigurationCategory("export")
+    public static final ConfigurationItem<Boolean> overwriteExistingFiles = null;
+
     @ConfigurationDefaultBoolean(false)
     @ConfigurationCategory("export")
     public static final ConfigurationItem<Boolean> openFolderAfterFlaExport = null;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ExportScriptTask.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ExportScriptTask.java
index b0a2435fc..4051cfa6c 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ExportScriptTask.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ExportScriptTask.java
@@ -82,11 +82,15 @@ public class ExportScriptTask implements Callable<File> {
             public void run() throws IOException, InterruptedException {
                 startTime = System.currentTimeMillis();
 
+                File file = new File(f);
                 if (!exportSettings.singleFile) {
                     Path.createDirectorySafe(new File(directory));
+                    if (file.exists() && !Configuration.overwriteExistingFiles.get()) {
+                        this.result = file;
+                        return;
+                    }
                 }
 
-                File file = new File(f);
                 try (FileTextWriter writer = exportSettings.singleFile ? null : new FileTextWriter(Configuration.getCodeFormatting(), new FileOutputStream(f))) {
                     FileTextWriter writer2 = exportSettings.singleFile ? exportSettings.singleFileWriter : writer;
                     ScriptExportMode exportMode = exportSettings.mode;
diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index 22586dc88..4b34608e3 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -164,7 +164,8 @@ public class CommandLineArgumentParser {
         Configuration.parallelSpeedUp,
         Configuration.internalFlashViewer,
         Configuration.autoDeobfuscate,
-        Configuration.cacheOnDisk
+        Configuration.cacheOnDisk,
+        Configuration.overwriteExistingFiles
     };
 
     public static boolean isCommandLineMode() {
@@ -584,9 +585,6 @@ public class CommandLineArgumentParser {
             }
             String key = cp[0];
             String value = cp[1];
-            if (key.toLowerCase().equals("paralelSpeedUp".toLowerCase())) {
-                key = "parallelSpeedUp";
-            }
             for (ConfigurationItem<Boolean> item : commandlineConfigBoolean) {
                 if (key.toLowerCase().equals(item.getName().toLowerCase())) {
                     Boolean bValue = parseBooleanConfigValue(value);
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
index 7502d8b2a..af3740d03 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
@@ -369,3 +369,5 @@ config.description.deobfuscationOldMode = Disable new deobfuscation and use the
 config.name.ignoreCLikePackages = Ignore FlashCC / Alchemy or similar packages
 config.description.ignoreCLikePackages = FlashCC/Alchemy packages cannot usually be decompiled correctly. You can disable them to speedup other packages decompilation.
 
+config.name.overwriteExistingFiles = Overwrite the existing files
+config.description.overwriteExistingFiles = Overwrite the existing files during export. Currently only for AS2/3 scripts
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties
index 545bb3a3d..6260dc64d 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties
@@ -365,3 +365,9 @@ config.description.exeExportMode = EXE export m\u00f3d
 
 config.name.deobfuscationOldMode = Kapcsol\u00f3 a r\u00e9gi (5.x) deobfuszk\u00e1l\u00e1si m\u00f3d haszn\u00e1lat\u00e1hoz
 config.description.deobfuscationOldMode = Kikapcsolja az \u00faj deobfuszk\u00e1l\u00e1si m\u00f3dot \u00e9s az el\u0151z\u0151 verzi\u00f3kban l\u00e9v\u0151 m\u00f3dot haszn\u00e1lja. NEM AJ\u00c1NLOTT.
+
+config.name.ignoreCLikePackages = FlashCC / Alchemy vagy hasonl\u00f3 csomagok figyelmen k\u00edv\u00fcl hagy\u00e1sa
+config.description.ignoreCLikePackages = FlashCC/Alchemy csomagok \u00e1ltal\u00e1ban nem ford\u00edthat\u00f3ak vissza hib\u00e1tlanul. Kikapcsolhatod hogy gyorsabban visszaford\u00edtsa a t\u00f6bbi csomagot.
+
+config.name.overwriteExistingFiles = L\u00e9tez\u0151 f\u00e1jlok fel\u00fcl\u00edr\u00e1sa
+config.description.overwriteExistingFiles = Fel\u00fcl\u00edrja a l\u00e9tez\u0151 f\u00e1jlokat export\u00e1l\u00e1s sor\u00e1n. Jelenleg csak az AS2/3 szkriptekre \u00e9rv\u00e9nyes