diff --git a/source/net/sourceforge/filebot/cli/CmdlineOperations.java b/source/net/sourceforge/filebot/cli/CmdlineOperations.java
index 3695f7da..8d7a83ab 100644
--- a/source/net/sourceforge/filebot/cli/CmdlineOperations.java
+++ b/source/net/sourceforge/filebot/cli/CmdlineOperations.java
@@ -351,7 +351,7 @@ public class CmdlineOperations implements CmdlineInterface {
 					
 					// match movie info to movie files that match the nfo file name
 					SortedSet<File> siblingMovieFiles = new TreeSet<File>(filter(movieFiles, new ParentFilter(nfo.getParentFile())));
-					String baseName = stripReleaseInfo(getName(nfo).toLowerCase());
+					String baseName = stripReleaseInfo(getName(nfo)).toLowerCase();
 					
 					for (File movieFile : siblingMovieFiles) {
 						if (stripReleaseInfo(getName(movieFile)).toLowerCase().startsWith(baseName)) {
@@ -378,7 +378,7 @@ public class CmdlineOperations implements CmdlineInterface {
 		movieMatchFiles.addAll(filter(files, DISK_FOLDERS));
 		movieMatchFiles.addAll(filter(orphanedFiles, SUBTITLE_FILES)); // run movie detection only on orphaned subtitle files
 		
-		// map movies to (possibly multiple) files (in natural order) 
+		// map movies to (possibly multiple) files (in natural order)
 		Map<Movie, SortedSet<File>> filesByMovie = new HashMap<Movie, SortedSet<File>>();
 		
 		// map all files by movie
@@ -509,7 +509,7 @@ public class CmdlineOperations implements CmdlineInterface {
 						CLILogger.info(format("Skipped [%s] because [%s] already exists", source, destination));
 					}
 					
-					// remember successfully renamed matches for history entry and possible revert 
+					// remember successfully renamed matches for history entry and possible revert
 					renameLog.add(new SimpleImmutableEntry<File, File>(source, destination));
 				} catch (IOException e) {
 					CLILogger.warning(format("[%s] Failed to rename [%s]", renameAction, it.getKey()));
diff --git a/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java b/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
index fe7b1229..4c9cf39f 100644
--- a/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
+++ b/source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
@@ -124,7 +124,7 @@ class MovieHashMatcher implements AutoCompleteMatcher {
 				
 				// match movie info to movie files that match the nfo file name
 				SortedSet<File> siblingMovieFiles = new TreeSet<File>(filter(movieFiles, new ParentFilter(nfo.getParentFile())));
-				String baseName = stripReleaseInfo(getName(nfo).toLowerCase());
+				String baseName = stripReleaseInfo(getName(nfo)).toLowerCase();
 				
 				for (File movieFile : siblingMovieFiles) {
 					if (stripReleaseInfo(getName(movieFile)).toLowerCase().startsWith(baseName)) {
@@ -181,7 +181,7 @@ class MovieHashMatcher implements AutoCompleteMatcher {
 			executor.shutdownNow();
 		}
 		
-		// map movies to (possibly multiple) files (in natural order) 
+		// map movies to (possibly multiple) files (in natural order)
 		Map<Movie, SortedSet<File>> filesByMovie = new HashMap<Movie, SortedSet<File>>();
 		
 		// collect movie part data