Fix SOAP-2161