Clustering fix