Hi François and Nick,

I have tested this small patch, implementing Nick's solution.
No breakage on my side -- but let's be careful here.

Thanks for testing,