#26 should fix this.