Fixed an issue with timezone