Fix emitted behavior