Undo - redo fix