Sorry for the delay in my response (thanks Adam!) but I’ve been away camping for three weeks. A much needed break.
Anyway, did Adam’s solution work ok for you?
I’ll hopefully post a generic solution within a few days as v3.02 will be released shortly. Hopefully within days.