fix #6133 for #6132