Propose for fix #4638