Closes #1637 See merge request main/Sumatra!1380 sumatra-commit: 27841becc6340e0169551287410d51a8865d86cc