RunModel.Supervisor: error with Diversion node

If the GRiwrm object contains Diversion that are not adjoin to the "normal" node in the table, we face this kind of error:

Processing: 0%Error in FUN(X[[i]], ...) : 
  Node 54001 must be a Direct Injection or a Diversion node

Its due to an offset in the labels of the node properties list.