Fix clusters