Auto cancelling was fixed