Fixed a small bug with timezones