Martyn posted a long awaited fix for this on 19th August 2020. The link appears to be broken; can you fix it or email me the file directly? Thanks