timob-12816: address comments
timob-12816: small fix