diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryImpl.java
index 065d0a6..9037656 100644
--- a/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryImpl.java
@@ -99,7 +99,10 @@ public class ModelTestMetricsJobRepositoryImpl extends QuerydslRepositorySupport
         .on(
             modelMetricsTestEntity.model.eq(modelMetricsTrainEntity.model),
             modelMasterEntity.bestEpoch.eq(modelMetricsTrainEntity.epoch))
-        .where(modelMetricsTestEntity.model.id.eq(modelId))
+        .where(
+            modelMetricsTestEntity.model.id.eq(modelId),
+            modelMetricsTestEntity.model1.eq(
+                "best_changed_fscore_epoch_" + modelMasterEntity.bestEpoch))
         .fetchOne();
   }