Propagation fixed
Fixing clusterMap