#6140 could be useful to fix this.