Fix the final score calculator