diff --git a/src/components/specific_challenge/Leaderboard/Leaderboard.js b/src/components/specific_challenge/Leaderboard/Leaderboard.js
index 477200f..5b4268d 100644
--- a/src/components/specific_challenge/Leaderboard/Leaderboard.js
+++ b/src/components/specific_challenge/Leaderboard/Leaderboard.js
@@ -34,7 +34,7 @@ const Leaderboard = (props) => {
     const getMetricIndex = (metricName) => {
         let i = 0;
         for (let evaluation of entriesFromApi[0].evaluations) {
-            if (evaluation.test.metric === metricName) {
+            if (`${evaluation.test.metric}.${evaluation.test.name}` === metricName) {
                 return i;
             }
             i++;