fixing cluster related problems
fixing cluster related problems