Fixed bug in SetCluster