Scope Bugfix