Fixing Cluster Class