Small fix for some event runners, and to refactor task method

This patch intend to fix for #163 and #162
Not really what we want here, no?