undo bug fixed 2