Fix #9621