timob-16180: addressed comment