timob-15345: address comment