Apologies, the previous patch got mangled, please see the patch attached
to this message.