Fixed issue with timezones