Closes #1668 See merge request main/Sumatra!1421 sumatra-commit: bf67505489a3e6e86458433729974d4725b339e8