fix #6480