Found a bug caused by the recent refactor.

Must improve the time based window unit tests, as I only found the bug
by running the stress test!!!!!!