Score Calculation Bug Fix