Fix #8555