diff --git a/mlair/helpers/statistics.py b/mlair/helpers/statistics.py
index 30391998c65950f12fc6824626638788e1bd721b..15cef734eae0ece73ede9bd66d1e55b9d67a1a3d 100644
--- a/mlair/helpers/statistics.py
+++ b/mlair/helpers/statistics.py
@@ -296,7 +296,7 @@ class SkillScores:
 
         :return: skill score for each comparison and forecast step
         """
-        ahead_names = list(range(1, window_lead_time + 1))
+        ahead_names = list(self.external_data.ahead.data)
         combinations, combination_strings = self.get_model_name_combinations()
         skill_score = pd.DataFrame(index=combination_strings)
         for iahead in ahead_names:
@@ -322,7 +322,7 @@ class SkillScores:
 
         :return: all CASES as well as all terms
         """
-        ahead_names = list(range(1, window_lead_time + 1))
+        ahead_names = list(self.external_data.ahead.data)
 
         all_terms = ['AI', 'AII', 'AIII', 'AIV', 'BI', 'BII', 'BIV', 'CI', 'CIV', 'CASE I', 'CASE II', 'CASE III',
                      'CASE IV']