fix #6798