Handle timezone correctly