Closes #1567 See merge request main/Sumatra!1316 sumatra-commit: 68e956ecdb365866d2501ca1404473c235027db7