mc, thank you for that GitHub fork. All's working fine now.