fix - undo - part 1