fixes on emit