CHRON-8 fix race condition