Fixing scoring issue