Yet another attempt at fixing this.