Fixed cancel and freeze