Fix OrganizationRole.role_for method