fix FS#809 - Hatch modifications and undo