Absolutely. I've re-written the commit to address this.