Fix_SOAP-2294

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