Fix context of "next" event handlers