Fix id_with_score