diff --git a/include/common.h b/include/common.h
index 21273ad..3b88384 100644
--- a/include/common.h
+++ b/include/common.h
@@ -50,4 +50,4 @@
 // macro to get time in milliseconds
 #define GET_TIME_MS() get_current_time()
 // defined in common.c due to differences with windows and other systems
-uint64_t get_current_time();
\ No newline at end of file
+int64_t get_current_time();
\ No newline at end of file
diff --git a/src/common.c b/src/common.c
index 549b1a4..e4a3413 100644
--- a/src/common.c
+++ b/src/common.c
@@ -6,21 +6,36 @@
 
 #include "common.h"
 
+
 //============================
 //==== get_current_time() ====
 //============================
 // Function that returns current time in milliseconds (can be used on windows and other systems)
-uint64_t get_current_time() {
-#ifdef _WIN32
+int64_t get_current_time()
+{
+#ifdef WIN32
+    //=== WINDOWS ===
     FILETIME ft;
+    LARGE_INTEGER li;
+    // Get the amount of 100 nano seconds intervals elapsed since January 1, 1601 (UTC) and copy it to a LARGE_INTEGER structure.
     GetSystemTimeAsFileTime(&ft);
-    ULARGE_INTEGER uli;
-    uli.LowPart = ft.dwLowDateTime;
-    uli.HighPart = ft.dwHighDateTime;
-    return uli.QuadPart / 10000;  // convert 100-nanoseconds to milliseconds
+    li.LowPart = ft.dwLowDateTime;
+    li.HighPart = ft.dwHighDateTime;
+    uint64_t ret = li.QuadPart;
+    ret -= 116444736000000000LL; // Convert from file time to UNIX epoch time.
+    ret /= 10000;                // From 100 nano seconds (10^-7) to 1 millisecond (10^-3) intervals
+    return ret;
+
 #else
+
+    //=== LINUX ===
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    return (uint64_t)tv.tv_sec * 1000 + tv.tv_usec / 1000;  // convert microseconds to milliseconds
+    uint64_t ret = tv.tv_usec;
+    // Convert from micro seconds (10^-6) to milliseconds (10^-3)
+    ret /= 1000;
+    // Adds the seconds (10^0) after converting them to milliseconds (10^-3)
+    ret += (tv.tv_sec * 1000);
+    return ret;
 #endif
 }
\ No newline at end of file