Fixed SOAP Bug