Second try at fixing this.