timob-12826: address comment