Fixed up problem with Cluster