Fix the issues with time