fix as Artem's comments