Fix #464 for user-cancel