Partial fix for TimeZone #726