Fix #16071

Fix #16071