Fix #7904