fix #6242