@benbjohnson Is this a related change to the data race?