Cluster fix