Fix error on cancel (not ever called when nedded)