APIDOC-1 Fix multiple scopes