fix: resolve correctness bugs and improve robustness#4

cymoo wants to merge 1 commit into

maincymoo/mint:mainfrom

fix/bugs-and-improvementscymoo/mint:fix/bugs-and-improvementsCopy head branch name to clipboard