bug fix and now copes with donations