Fix issue with editing mentions