Update to fix emitter issue