oh wait, I failed to send v2 of this patch. Will do so.