fixed clustering issue