fix #6704