diff --git a/source/net/sourceforge/filebot/cli/CmdlineOperations.java b/source/net/sourceforge/filebot/cli/CmdlineOperations.java
index 14799afa..5dbba53f 100644
--- a/source/net/sourceforge/filebot/cli/CmdlineOperations.java
+++ b/source/net/sourceforge/filebot/cli/CmdlineOperations.java
@@ -1082,7 +1082,7 @@ public class CmdlineOperations implements CmdlineInterface {
 				}
 				
 				CLILogger.info(String.format("Read archive [%s] to [%s]", file.getName(), outputFolder));
-				FileMapper outputMapper = new FileMapper(outputFolder, false);
+				final FileMapper outputMapper = new FileMapper(outputFolder, false);
 				
 				final List<File> outputMapping = new ArrayList<File>();
 				for (File entry : archive.listFiles()) {
@@ -1119,7 +1119,7 @@ public class CmdlineOperations implements CmdlineInterface {
 							
 							@Override
 							public boolean accept(File entry) {
-								return selection.contains(entry);
+								return selection.contains(outputMapper.getOutputFile(entry));
 							}
 						});
 						extractedFiles.addAll(selection);