Fixed state issue