Undo#74

Close #74