Fix #7828