Closes #1666 See merge request main/Sumatra!1420 sumatra-commit: 98fcf4bbf1375df55f8722a6ffcbba359f3e9cf4