#330 will fix this.  Yay!