Closes #1583 See merge request main/Sumatra!1329 sumatra-commit: d6c67bc1d00e369f759cb83b8d36162445eef67b