Re-re-fix a state bug