Fix problem triggered by stale history list