Cluster bug fixed