diff --git a/GBM/Classes/clsBackup.vb b/GBM/Classes/clsBackup.vb
index 36ca950..f790844 100644
--- a/GBM/Classes/clsBackup.vb
+++ b/GBM/Classes/clsBackup.vb
@@ -47,6 +47,12 @@
         End Get
     End Property
 
+    ReadOnly Property FileSafeName As String
+        Get
+            Return mgrPath.ValidateFileNameForOS(sName)
+        End Get
+    End Property
+
     Property FileName As String
         Get
             If mgrCommon.IsUnix Then
diff --git a/GBM/Managers/mgrCommon.vb b/GBM/Managers/mgrCommon.vb
index ccdeb1a..2f3ca54 100644
--- a/GBM/Managers/mgrCommon.vb
+++ b/GBM/Managers/mgrCommon.vb
@@ -437,8 +437,8 @@ Public Class mgrCommon
         'Check if the sub-folder is an ID or Name
         If oBackup.FileName.StartsWith(oBackup.MonitorID & Path.DirectorySeparatorChar) Then
             sDir = sBackupFolder & oBackup.MonitorID
-        ElseIf oBackup.FileName.StartsWith(oBackup.Name & Path.DirectorySeparatorChar) Then
-            sDir = sBackupFolder & oBackup.Name
+        ElseIf oBackup.FileName.StartsWith(oBackup.FileSafeName & Path.DirectorySeparatorChar) Then
+            sDir = sBackupFolder & oBackup.FileSafeName
         Else
             Exit Sub
         End If