Re-re-re-re fix a state bug