I think I'll just merge your pull request and then fix this myself.