fix issue with what on/emit are saved