timob-13686-v1: addressed comment