Handle long intervals correctly