This fixes <https://gitlab.unige.ch/prods/ies/recherche/hpc/-/issues/1312> and <https://gitlab.unige.ch/prods/ies/recherche/hpc/-/issues/1296>.