EventEmitter fix