This fix is from @NanXiao, however I was not able to retain authorship
because the Pull Request original repository was removed.