Correct a bug in Cluster