Created #227 to address this.