Fix bug related to time zones