Fix SOAP-2049 and SOAP-2107