Fix in Cluster Class