CLustering fixed