Fix #16897