Let's try to avoid changes like this.