Fix Scope Bug

Fix Scope Bug