fix receiver id problems