Fix bug with timezone