Changed how race condition checking works