cluster bug fix