diff --git a/source/net/sourceforge/filebot/cli/CmdlineOperations.java b/source/net/sourceforge/filebot/cli/CmdlineOperations.java
index 3df5d087..0ceae95c 100644
--- a/source/net/sourceforge/filebot/cli/CmdlineOperations.java
+++ b/source/net/sourceforge/filebot/cli/CmdlineOperations.java
@@ -77,7 +77,7 @@ import net.sourceforge.filebot.web.SortOrder;
 import net.sourceforge.filebot.web.SubtitleDescriptor;
 import net.sourceforge.filebot.web.SubtitleProvider;
 import net.sourceforge.filebot.web.VideoHashSubtitleService;
-import net.sourceforge.tuned.FileUtilities.FolderFilter;
+import net.sourceforge.tuned.FileUtilities.ParentFilter;
 
 
 public class CmdlineOperations implements CmdlineInterface {
@@ -341,7 +341,7 @@ public class CmdlineOperations implements CmdlineInterface {
 					movieByFile.put(nfo, movie);
 					
 					// match movie info to movie files that match the nfo file name
-					SortedSet<File> siblingMovieFiles = new TreeSet<File>(filter(movieFiles, new FolderFilter(nfo.getParentFile())));
+					SortedSet<File> siblingMovieFiles = new TreeSet<File>(filter(movieFiles, new ParentFilter(nfo.getParentFile())));
 					String baseName = stripReleaseInfo(getName(nfo));
 					
 					for (File movieFile : siblingMovieFiles) {
diff --git a/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java b/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
index c57f8b20..79034518 100644
--- a/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
+++ b/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
@@ -49,7 +49,7 @@ import net.sourceforge.filebot.web.Movie;
 import net.sourceforge.filebot.web.MovieIdentificationService;
 import net.sourceforge.filebot.web.MoviePart;
 import net.sourceforge.filebot.web.SortOrder;
-import net.sourceforge.tuned.FileUtilities.FolderFilter;
+import net.sourceforge.tuned.FileUtilities.ParentFilter;
 
 
 class MovieHashMatcher implements AutoCompleteMatcher {
@@ -105,7 +105,7 @@ class MovieHashMatcher implements AutoCompleteMatcher {
 				movieByFile.put(nfo, movie);
 				
 				// match movie info to movie files that match the nfo file name
-				SortedSet<File> siblingMovieFiles = new TreeSet<File>(filter(movieFiles, new FolderFilter(nfo.getParentFile())));
+				SortedSet<File> siblingMovieFiles = new TreeSet<File>(filter(movieFiles, new ParentFilter(nfo.getParentFile())));
 				String baseName = stripReleaseInfo(getName(nfo));
 				
 				for (File movieFile : siblingMovieFiles) {
diff --git a/source/net/sourceforge/tuned/FileUtilities.java b/source/net/sourceforge/tuned/FileUtilities.java
index ebd48927..129f438c 100644
--- a/source/net/sourceforge/tuned/FileUtilities.java
+++ b/source/net/sourceforge/tuned/FileUtilities.java
@@ -556,19 +556,19 @@ public final class FileUtilities {
 	};
 	
 	
-	public static class FolderFilter implements FileFilter {
+	public static class ParentFilter implements FileFilter {
 		
 		private final File folder;
 		
 		
-		public FolderFilter(File folder) {
+		public ParentFilter(File folder) {
 			this.folder = folder;
 		}
 		
 		
 		@Override
 		public boolean accept(File file) {
-			return file.getParentFile().equals(folder);
+			return listPath(file).contains(folder);
 		}
 	}