fix undeferred cancels