fix a couple of bugs in Make Receiver