[BF] Stale reference to infrastructures