SOAP fix