Fixed bad clustering indexing bug