Fix problem in Cluster class