(#1604) - On cancel, call changes complete last