Fixed Cancel bug