no more undo bugs