Okay, we should add an issue for this.