timob-14224: addressed comment