I will ask @SystemFiles to look into this.