OK, I've attached the patch. It wasn't clear from https://orgmode.org/worg/org-contribute.html#first-patch whether this should be sent in the thread or as a new thread. I can start a new one if needed.

Thanks,

Derek