timob-12583: address comment