Fix cluster bug