Fixed Timekeeper: checking boundary conditions better.