fixed to account for missing timezones