Fixed the clustering