Fix time zone  bug