Fixed retrieve stale issues