Remove '+' on receive and replace on send