Add/remove giver bug.