timob-14662: address comment