Fixed bug with system time