Fix to parsing to correctly parse recipient [RD-84]