Fix to scope fix