diff --git a/rowers/tests/test_units.py b/rowers/tests/test_units.py
index 95f76243..77827338 100644
--- a/rowers/tests/test_units.py
+++ b/rowers/tests/test_units.py
@@ -85,7 +85,7 @@ class ForceUnits(TestCase):
 
         df = dataprep.clean_df_stats(df,ignoreadvanced=False)
         average_N = int(df['averageforce'].mean())
-        self.assertEqual(average_N,399)
+        self.assertEqual(average_N,398)
 
     def test_upload_speedcoach_N(self):
         login = self.c.login(username=self.u.username, password=self.password)
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index d8727522..bc6e5e60 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -318,6 +318,7 @@ def trendflexdata(workouts, options,userid=0):
     datadf['date'].replace(datemapping,inplace=True)
 
     today = datetime.date.today()
+
     datadf['days ago'] = list(map(lambda x : x.days, datadf.date - today))
 
 
@@ -648,6 +649,8 @@ def boxplotdata(workouts,options):
 
     datadf['workoutid'].replace(datemapping,inplace=True)
     datadf.rename(columns={"workoutid":"date"},inplace=True)
+    datadf['date'] = pd.to_datetime(datadf['date'],errors='coerce')
+    datadf = datadf.dropna(subset=['date'])
     datadf = datadf.sort_values(['date'])
 
     if userid == 0: