[#1874] Now with fewer race conditions