Wrong sorting for calibration of ungauged nodes

A study case coming from the EPTB SMIAGE has raised a calibration issue.

Here the network with ungauged nodes and user defined donors mixing downstream, upstream and sibling donors:

And here's the error at Calibration:

Calibration.GRiwrmInputsModel: Processing sub-basin Mons...
Calibration.GRiwrmInputsModel: Processing sub-basin Callian...
Calibration.GRiwrmInputsModel: Processing sub-basin Montauroux...
Calibration.GRiwrmInputsModel: Processing sub-basin Biancon...
Calibration.GRiwrmInputsModel: Processing sub-basin Veyans...
Calibration.GRiwrmInputsModel: Processing sub-basin LacSaintCassien...
Parameters already fixed - no need for calibration
	     Param = 10000000000.000,    0.500
Calibration.GRiwrmInputsModel: Processing sub-basin Tanneron...
Calibration.GRiwrmInputsModel: Processing sub-basin Valcluse...
Erreur dans .ArgumentsCheckGR(InputsModel, RunOptions, Param) : 
  'Param' must be a vector of length 5 and contain no NA

There error comes from a messy sorting where the node "Mourachonne" (together with "GrandVallon") should be calibrated before the "Valcluse" one.

Maybe due to a confusion between ungauged influence area and ungauged calibration cluster area in the code...