SOAP-989: extracted a method