Fixed a bug with events slightly in the future
Corrected the regression

Which occured if you had no start or stop