[re-commit in git]
Second variant of the fix: reduce the scope of 'role' variable