Merge pull request #1798 from merico-dev/fix#1788

fix: #1788