Fix cluster key
Merge pull request #1083 from psav/cluster_key

Fix cluster key