Hopefully this solve SOAP-2161 issue

https://smartbearsweden.atlassian.net/browse/SOAP-2161