diff --git a/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java b/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
index a78bb3f6..84f0ebd6 100644
--- a/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
+++ b/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
@@ -222,23 +222,21 @@ class MovieHashMatcher implements AutoCompleteMatcher {
 		List<Match<File, ?>> matches = new ArrayList<Match<File, ?>>();
 
 		for (Entry<Movie, SortedSet<File>> byMovie : filesByMovie.entrySet()) {
-			for (List<File> byFolder : mapByFolder(byMovie.getValue()).values()) {
-				for (List<File> fileSet : mapByExtension(byFolder).values()) {
-					// resolve movie parts
-					for (int i = 0; i < fileSet.size(); i++) {
-						Movie moviePart = byMovie.getKey();
-						if (fileSet.size() > 1) {
-							moviePart = new MoviePart(moviePart, i + 1, fileSet.size());
-						}
+			for (List<File> fileSet : mapByExtension(byMovie.getValue()).values()) {
+				// resolve movie parts
+				for (int i = 0; i < fileSet.size(); i++) {
+					Movie moviePart = byMovie.getKey();
+					if (fileSet.size() > 1) {
+						moviePart = new MoviePart(moviePart, i + 1, fileSet.size());
+					}
 
-						matches.add(new Match<File, Movie>(fileSet.get(i), moviePart.clone()));
+					matches.add(new Match<File, Movie>(fileSet.get(i), moviePart.clone()));
 
-						// automatically add matches for derived files
-						List<File> derivates = derivatesByMovieFile.get(fileSet.get(i));
-						if (derivates != null) {
-							for (File derivate : derivates) {
-								matches.add(new Match<File, Movie>(derivate, moviePart.clone()));
-							}
+					// automatically add matches for derived files
+					List<File> derivates = derivatesByMovieFile.get(fileSet.get(i));
+					if (derivates != null) {
+						for (File derivate : derivates) {
+							matches.add(new Match<File, Movie>(derivate, moviePart.clone()));
 						}
 					}
 				}