[Basic Math Gaps] Fixed issue with missing events.