diff --git a/taskt/Core/Automation/Commands/Data/DateCalculationCommand.cs b/taskt/Core/Automation/Commands/Data/DateCalculationCommand.cs
index 3ef72e122..36802dc01 100644
--- a/taskt/Core/Automation/Commands/Data/DateCalculationCommand.cs
+++ b/taskt/Core/Automation/Commands/Data/DateCalculationCommand.cs
@@ -1,7 +1,9 @@
 using System;
-using System.Xml.Serialization;
-using System.IO;
 using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Xml.Serialization;
 using System.Windows.Forms;
 using taskt.UI.Forms;
 using taskt.UI.CustomControls;
@@ -147,6 +149,7 @@ public override void RunCommand(object sender)
 
             //handle if formatter is required     
             var formatting = v_ToStringFormat.ConvertToUserVariable(sender);
+            formatting = Regex.Replace(formatting, @"[.,:;\/\\]", x => $"'{x}'");
             var stringDateFormatted = requiredDateTime.ToString(formatting);