synchronize with alwin's undo commit