Hi Daniele,

Thanks for the suggestion and the accompanying patch.  I've just applied
a modified version of your patch (included below).  Please let me know
if this is insufficient for your needs.

Best,