Initial hacky fix for time zones