Fix scores calculation