Fix #8668