add SOAP fix for some cases