small improvement to cluster manager