Re-fix a state bug