so we see if this patch is necessary first. then we will reimplement it properly, as the current patch is not race condition safe.