Bug fix + change in the way adopted to mark used clusters