SOAP-491 Fixed bug