Fix #8642