Attempting to fix this.....