Undo/Redo fix...