Fix #8604