SOAP bugfix