Fix ScoreKeeper duplication on retry