Fix the UTC issue