Bug #2682: fill in already present clustes automatically