Time Zone short term fix