Bugfix for handling non-standard comma-separated scopes