Undo redo fix