Fix PR16807