Race condition fix try