Fix_SOAP-2290

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