fix #6935