Fix time and date issuse