I'll create another issue to specifically deal with this.