Imported fixed pre-2.0 copied from the better-risk branch
Fixed a misprint
Merge pull request #1548 from gem/fix-event-based

Important fixes pre-2.0 copied from the better-risk branch