Another try at fixing this.