Stop on more events, refs item:633