@gtlnikita - thanks for picking up on this, forgot that PR #143 had been merged in here. Looking at the changes that I have suggested, this is for the same method that I referenced in the commit (findLastDonationForDonor). I think the best thing would be to merge the new, more recent changes made to #143 into this issue, so that the most recent code from #60 is used. I will look into this.