Fixed state bug