Fix one race condition with another.