vergilcw

Hi @trusktr and @sy-records, I have the same issue as the OP. Merging this PR would be a big help, thanks for taking a look!