bug fix for clusters