Fixed handling scopes