update for bug #16047: fix crash on undo