diff --git a/Analytics/Model/BaseAction.cs b/Analytics/Model/BaseAction.cs
index 1b8445d2..fca57040 100644
--- a/Analytics/Model/BaseAction.cs
+++ b/Analytics/Model/BaseAction.cs
@@ -36,9 +36,9 @@ internal BaseAction(string type, string UserId, Options options)
 			this.Type = type;
 			this.MessageId = Guid.NewGuid ().ToString();
 			if (options.Timestamp.HasValue)
-				this.Timestamp = options.Timestamp.ToString ();
-            else
-                this.Timestamp = DateTime.Now.ToString("o");
+				this.Timestamp = options.Timestamp.Value.ToString("o");
+            		else
+                		this.Timestamp = DateTime.Now.ToString("o");
 			this.Context = options.Context;
 			this.Integrations = options.Integrations;
 			this.AnonymousId = options.AnonymousId;