Fix issue with timezone offset