Closes #1624 See merge request main/Sumatra!1365 sumatra-commit: ec7cea7f97c067241a2c731f684ec9f6c2d35900