fix clustering issues