Fix_SOAP-2292

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