BTW, we could open an issue as a reminder that we need to improve this.