tweaked handling of timezones