fix the timezone issue