upstream scope fix