Merge pull request #2496 from dunxen/2023-08-fix2488