undo and redo fix2