fix #6415