fix #7499