Fix a bug related to tranches (#579)