Another race condition fixed