Fix bugs in Cluster
Bugs in Cluster fuction make clusters much larger than usual.