Fixed Event Emitter Bug