Proper fix for the quickfix of timezones detection