Clean up race condition fix