Fixed cancel logic