Scope fix