Fix ambiguities with cluster
#839
+15
−5
Merged
cluster
#839