Definitely appreciate your work on this upstream. I'll put in your proposed fix until your pull request is accepted.