Fix Scopes