Fixed EventEmitter wrapping bug