Clustering bug fixed