Fix race condition in 045ed5b47a0c92cb9d0cd887c555761f17461e43
[14638652]