State redo fix