timob-10136: address comment