Add wait for Cancel