Fix #7918