1.8 helper undo fix