Fix soap 2074

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