Thank you James for your work and this fix.
Can you estimate how long it will take until it is merged?