fix all scopes
fix new scope