fix add/remove callback-waitCallback pair