Fixing bug donkeys