diff --git a/source/net/filebot/media/NamingStandard.java b/source/net/filebot/media/NamingStandard.java
index 6cf3f958..058de828 100644
--- a/source/net/filebot/media/NamingStandard.java
+++ b/source/net/filebot/media/NamingStandard.java
@@ -72,12 +72,15 @@ public enum NamingStandard {
 
 	private static String path(String... name) {
 		return stream(name).filter(Objects::nonNull).map(s -> {
-			s = replaceColon(s, ".", " - ");
-			s = replacePathSeparators(s, " ");
-			s = normalizeQuotationMarks(s);
-			s = trimTrailingPunctuation(s);
-			s = validateFileName(s);
-			return s;
+			return replaceColon(s, ".", " - ");
+		}).map(s -> {
+			return replacePathSeparators(s, " ");
+		}).map(s -> {
+			return normalizeQuotationMarks(s);
+		}).map(s -> {
+			return trimTrailingPunctuation(s);
+		}).map(s -> {
+			return validateFileName(s);
 		}).filter(s -> s.length() > 0).collect(joining("/"));
 	}