Fix SOAP format