timob-11282: address comment