Fixing score scoping issue