#217 does this.