fix #6502