Adjust has_scopes - again