Fix Cancel bug