#42 addresses this.