Fix #8874