fix duplicate emits added problems