Fixed emitter bug