OK. So this patch is ok I guess; I updated the PR earlier.