timob-16180-3: addressed comments