Resolve the issue with the default scope being overriden