enabled race condition fix