Fixes SOAP-1