fixed donor bugs