[CHANGE] fix cluster handling;