Fix #8898