Global scope fix