Fixed issue with timezone settings