Fix #4662