Closes #1582 See merge request main/Sumatra!1328 sumatra-commit: 8a6ae4c3ee6123877fc8e98c9035c845ccee4c42