Improve restoring point when canceling