this patch doesn't make the situation worse, actually