Glad to hear that you've tracked down the issue. I'll keep an eye out for the fix. Once you have it, this work is ready to merge.