Fix PR14175