INT-2120: fix as Artem's comments