Fix #8769