Add fix from #148 to ensure Donor Numbers are constant