Fixed cancel event stuff