timob-11888: address comment