PR #256 addresses this.