Try to fix undo