Another attempt to fix emitted event stuff.