Fixing up the emitted event