Revert "Revert "past events fixed""

This reverts commit 01e3b69093dc85b8e38e17d662ee6851eaf7e89b.