fix #6561