Fixed issue with incorrect time with dates (again)