I'll open a PR later to address this.