Fix_SOAP-2295

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