diff --git a/qdax/core/containers/unstructured_repertoire.py b/qdax/core/containers/unstructured_repertoire.py
index f4cc0c98..e7793825 100644
--- a/qdax/core/containers/unstructured_repertoire.py
+++ b/qdax/core/containers/unstructured_repertoire.py
@@ -104,7 +104,7 @@ def intra_batch_comp(
     # We want to eliminate the same individual (distance 0)
     fitness = jnp.where(knn_relevant_indices == current_index, False, fitness)
     current_fitness = jnp.squeeze(
-        eval_scores.at[knn_relevant_indices.at[0].get()].get()
+        eval_scores.at[current_index].get()
     )
 
     # Is the fitness of the other individual higher?