Attempting to fix the EventEmitter leak warning