Fix #18356