INT3341: change code for Artem's comments