fixed clustering (hopefully)