diff --git a/DBRepair-WinDev.bat b/DBRepair-WinDev.bat
index a941056..0ea9b09 100644
--- a/DBRepair-WinDev.bat
+++ b/DBRepair-WinDev.bat
@@ -9,8 +9,19 @@ REM
 REM 1. This is stable working software but not "Released" software.  Development will continue.
 REM 2. You must ensure variable PlexData points to your databases. (there is no automatic detection at this time)
 REM
-REM System format controls  ^Roll_eyes^
-set TimeStamp=%date:~10,4%-%date:~+4,2%-%date:~+7,2%_%time:~0,2%.%time:~3,2%.%time:~6,2%
+REM ### Extract the Date and Time
+set Day=%DATE:~0,2%
+set Month=%DATE:~3,2%
+set Year=%DATE:~6,4%
+set Hour=%TIME:~0,2%
+set Min=%TIME:~3,2%
+set Sec=%TIME:~6,2%
+
+REM ## Remove spaces from Hour ##
+set Hour=%Hour: =%
+
+REM ## Set TimeStamp ##
+set TimeStamp=%Year%-%Month%-%Day%_%Hour%-%Min%-%Sec%
 
 REM These assume PMS is in the default location
 set "PlexData=%LOCALAPPDATA%\Plex Media Server\Plug-in Support\Databases"
diff --git a/DBRepair-Windows.zip b/DBRepair-Windows.zip
index d98f6ac..ff109e3 100644
Binary files a/DBRepair-Windows.zip and b/DBRepair-Windows.zip differ