I'm making a PR for fixing up cases like this