reverted race condition fix