fix abort and cancel