diff --git a/source/net/filebot/archive/FileMapper.java b/source/net/filebot/archive/FileMapper.java
index 1658e9ab..1290c258 100644
--- a/source/net/filebot/archive/FileMapper.java
+++ b/source/net/filebot/archive/FileMapper.java
@@ -10,6 +10,10 @@ public class FileMapper implements ExtractOutProvider {
 	private File outputDir;
 	private boolean flatten;
 
+	public FileMapper(File outputDir) {
+		this(outputDir, false);
+	};
+
 	public FileMapper(File outputDir, boolean flatten) {
 		this.outputDir = outputDir;
 		this.flatten = flatten;
diff --git a/source/net/filebot/archive/SevenZipNativeBindings.java b/source/net/filebot/archive/SevenZipNativeBindings.java
index e74d7ee9..ce2a1494 100644
--- a/source/net/filebot/archive/SevenZipNativeBindings.java
+++ b/source/net/filebot/archive/SevenZipNativeBindings.java
@@ -79,12 +79,12 @@ public class SevenZipNativeBindings implements ArchiveExtractor, Closeable {
 
 	@Override
 	public void extract(File outputDir) throws Exception {
-		extract(new FileMapper(outputDir, false));
+		extract(new FileMapper(outputDir));
 	}
 
 	@Override
 	public void extract(File outputDir, FileFilter filter) throws Exception {
-		extract(new FileMapper(outputDir, false), filter);
+		extract(new FileMapper(outputDir), filter);
 	}
 
 	public void extract(ExtractOutProvider outputMapper) throws SevenZipException {
diff --git a/source/net/filebot/cli/CmdlineOperations.java b/source/net/filebot/cli/CmdlineOperations.java
index 5525618c..56cd556b 100644
--- a/source/net/filebot/cli/CmdlineOperations.java
+++ b/source/net/filebot/cli/CmdlineOperations.java
@@ -1135,7 +1135,7 @@ public class CmdlineOperations implements CmdlineInterface {
 				}
 
 				CLILogger.info(String.format("Read archive [%s] and extract to [%s]", file.getName(), outputFolder));
-				final FileMapper outputMapper = new FileMapper(outputFolder, false);
+				final FileMapper outputMapper = new FileMapper(outputFolder);
 
 				final List<FileInfo> outputMapping = new ArrayList<FileInfo>();
 				for (FileInfo it : archive.listFiles()) {
diff --git a/source/net/filebot/ui/analyze/ExtractTool.java b/source/net/filebot/ui/analyze/ExtractTool.java
index eb5ab649..95593914 100644
--- a/source/net/filebot/ui/analyze/ExtractTool.java
+++ b/source/net/filebot/ui/analyze/ExtractTool.java
@@ -249,7 +249,7 @@ class ExtractTool extends Tool<TableModel> {
 
 					Archive archive = Archive.open(file);
 					try {
-						final FileMapper outputMapper = new FileMapper(outputFolder, false);
+						final FileMapper outputMapper = new FileMapper(outputFolder);
 
 						final List<FileInfo> outputMapping = new ArrayList<FileInfo>();
 						for (FileInfo it : archive.listFiles()) {