Fix #8658