Fix #8976