Fix comment and check for role in fallback