Fixed Scope issue