Temporary fix while I get to the bottom of this.