Fix emitter issue