fix flag flickering on first retrieval.