better clustering fix