SOAP-697: Fixing in a better way