Resolved a state bug