Fixed issues with incorrect time