Clustering Bug Fix