Merge pull request #5563 from it-can/fix5545

fix #5545