Fixes #185. Remove recipient is working well now.