EventEmitter extention fix