diff --git a/Source/EmberCommon/EmberCommon.h b/Source/EmberCommon/EmberCommon.h
index c5418a1..bd1d2c6 100644
--- a/Source/EmberCommon/EmberCommon.h
+++ b/Source/EmberCommon/EmberCommon.h
@@ -347,16 +347,16 @@ static string MakeSingleFilename(const string& path, const string& out, const st
 	}
 	else if (useFinalName)
 	{
-		filename = path + prefix + finalName + suffix + "." + format;
+		filename = path + CleanPath(prefix + finalName + suffix + "." + format);
 	}
 	else
 	{
 		ostringstream fnstream;
-		fnstream << path << prefix << setfill('0') << setprecision(0) << fixed << setw(padding) << i << suffix << "." << format;
-		filename = fnstream.str();
+		fnstream << prefix << setfill('0') << setprecision(0) << fixed << setw(padding) << i << suffix << "." << format;
+		filename = path + CleanPath(fnstream.str());
 	}
 
-	return CleanPath(filename);
+	return filename;
 }
 
 /// <summary>
@@ -371,8 +371,8 @@ static string MakeSingleFilename(const string& path, const string& out, const st
 static string MakeAnimFilename(const string& path, const string& prefix, const string& suffix, const string& format, glm::uint padding, size_t ftime)
 {
 	ostringstream fnstream;
-	fnstream << path << prefix << setfill('0') << setprecision(0) << fixed << setw(padding) << ftime << suffix << format;
-	return CleanPath(fnstream.str());
+	fnstream << prefix << setfill('0') << setprecision(0) << fixed << setw(padding) << ftime << suffix << format;
+	return path + CleanPath(fnstream.str());
 }
 
 /// <summary>