Fix #7868