diff --git a/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.cpp b/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.cpp
index 2170f39141..0e1cde72c2 100644
--- a/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.cpp
@@ -68,8 +68,10 @@ QString RicSnapshotFilenameGenerator::generateSnapshotFilenameForRimView(Rim3dVi
                                           .arg(rimView->name())
                                           .arg(resultName(rimView));
 
-    if ( timeSteps.size() ) fileName += QString("_%1_%2").arg(timeStep, 2, 10, QChar('0'))
-                                                         .arg(timeSteps[timeStep].replace(".", "-"));
+    if ( !timeSteps.empty() ) fileName += QString("_%1_%2").arg(timeStep, 2, 10, QChar('0'))
+                                                           .arg(timeSteps[timeStep]);
+
+    fileName.replace("-", "_");
 
     fileName = caf::Utils::makeValidFileBasename(fileName);