fix potential bug where cluster list breaks unintentionally