Hack for events trigger notices

Please code review and test in 2.5, 2.7.