Opened #7 to address this.