fixed cluster bugs