fixes #206 - Finally seem to have cancel as undo working correctly in my basic testing