Stop on more events, closes item:633