I also have a fix for this that I'll put in a PR.