Created #77 to address this.