Fixed SOAP issue