Fix returning stale items