fix #4821