added fix for Cluster.py to work with hierarchical. I broke it earlier...