Fixed stale state bug