Cluster contraint fix

@guenter @florianleibert