*8805* Fix race condition