Fix the timeZone issue