timob-14940: address comment