timob-13738: address comment