Further undo-fixing