timob-12425: address comment