Fix past event logic flaw