Fix #4623