Fix problem with clustering.