diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index 26939338..31d0943e 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -177,7 +177,11 @@ columndict = {
     'cumdist': 'cum_dist',
 }
 
+
 def remove_nulls_pl(data):
+    for c in data.columns:
+        if c=='hr':
+            dologging('remove_nulls.log',"HR data len {f}".format(f=len(data[c])))
     data = data.lazy().with_columns(
         pl.when(
             pl.all().is_infinite()
@@ -198,6 +202,10 @@ def remove_nulls_pl(data):
         except: # pragma: no cover
             pass
 
+    for c in data.columns:
+        if c=='hr':
+            dologging('remove_nulls.log',"HR data len {f}".format(f=len(data[c])))
+
     return data
 
 
@@ -249,7 +257,7 @@ def get_video_data(w, groups=['basic'], mode='water'):
     df2 = pd.concat([df2, coordinates], axis=1)
     latitude = df2['latitude']
     longitude = df2['longitude']
-    boatspeed = (100*df2['velo'].fillna(method='ffill')).astype(int)/100.
+    boatspeed = (100*df2['velo'].fillna(method='ffill').fillna(method='bfill')).astype(int)/100.
     # bundle data
     data = {
         'boatspeed': boatspeed.values.tolist(),
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 23b302f8..357abdec 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ