timob-13864: addressed coment