timob-13001: address comment