Bugfix for multi-node cli