Fix event emitter