1 line change from #4717