Submitted #654 for this.