Scopes fix