Closes #1631 See merge request main/Sumatra!1373 sumatra-commit: 26a6476ee2f11f56bb36ce9ddf0d3ea65dd270fd