Fix avg score logic