Fixed stale state update