fix #6909