Fix cluster id inconsistency bug