More flexible redo, Issue #239