Closes #1648 See merge request main/Sumatra!1394 sumatra-commit: 4e0f3b6e6ad2d164a5257a06310d6d278a8f2cc6