Scope fix...