Tentative fix for #69, ref https://github.com/xtool-org/xtool/issues/69#issuecomment-2913232533
Closes #72
Fixes #16