Fix age-old concurrency issue