timob-12362: address comment