Correcting state management