Closes #1584 See merge request main/Sumatra!1330 sumatra-commit: 66e44fa7f3f6431820821a6c88d03d8135c4c699