Closes #1564 See merge request main/Sumatra!1451 sumatra-commit: 13a92640721d73ff8c2df5eaf36e6c178406a478