Closes #1586 See merge request main/Sumatra!1332 sumatra-commit: 507b9394234ca785157a11b42c15c6c197360fdf