Fix bug
Add wait for Cancel