Fix bug, cancel cannot work with submit variables used ...