Fix: SOAP-514