diff --git a/BeefLibs/corlib/src/Diagnostics/Stopwatch.bf b/BeefLibs/corlib/src/Diagnostics/Stopwatch.bf
index 7cde4654..9b53177c 100644
--- a/BeefLibs/corlib/src/Diagnostics/Stopwatch.bf
+++ b/BeefLibs/corlib/src/Diagnostics/Stopwatch.bf
@@ -113,7 +113,14 @@ namespace System.Diagnostics
 
         public static int64 GetTimestamp()
         {
-            return Internal.GetTickCountMicro();
+			if (Compiler.IsComptime)
+			{
+				return (.)Platform.BfpSystem_GetTimeStamp() / 10;
+			}
+			else
+			{
+	            return Internal.GetTickCountMicro();
+			}
         }
 
         // Get the elapsed ticks.