Fixed state bugs