diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 4faf1137..38fafec0 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -276,7 +276,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
     if windowsize <= 3:
 	windowsize = 5
 
-    if windowsize > 3:
+    if windowsize > 3 and windowsize<len(hr):
 	spm = savgol_filter(spm,windowsize,3)
 	hr = savgol_filter(hr,windowsize,3)
 	drivelength = savgol_filter(drivelength,windowsize,3)
@@ -348,7 +348,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
             driveenergy = rowdatadf.ix[:,'driveenergy']
             drivelength = driveenergy/(averageforce*4.44822)
             slip = rowdatadf.ix[:,'slip']
-            if windowsize > 3:
+            if windowsize > 3 and windowsize<len(slip):
                 wash = savgol_filter(wash,windowsize,3)
                 slip = savgol_filter(slip,windowsize,3)
                 catch = savgol_filter(catch,windowsize,3)
diff --git a/rowers/views.py b/rowers/views.py
index 08b7e9e3..11b653d6 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -420,7 +420,7 @@ def add_workout_from_strokedata(user,importid,data,strokedata,source='c2'):
 
     df['originalvelo'] = velo
 
-    if windowsize > 3:
+    if windowsize > 3 and windowsize < len(velo):
 	velo2 = savgol_filter(velo,windowsize,3)
     else:
 	velo2=velo
@@ -652,7 +652,7 @@ def add_workout_from_stdata(user,importid,data):
 
     df['originalvelo'] = velo
 
-    if windowsize > 3:
+    if windowsize > 3 and windowsize<len(velo):
 	velo2 = savgol_filter(velo,windowsize,3)
     else:
 	velo2 = velo
@@ -3635,7 +3635,7 @@ def workout_upload_view(request,message=""):
 		if not 'originalvelo' in row.df:
 		    row.df['originalvelo'] = velo
 
-		if windowsize > 3:
+		if windowsize > 3 and windowsize<len(velo):
 		    velo2 = savgol_filter(velo,windowsize,3)
 		else:
 		    velo2 = velo
@@ -3707,7 +3707,7 @@ def workout_upload_view(request,message=""):
 		w.save()
                 # put stroke data in database
                 res = dataprep.dataprep(row.df,id=w.id,bands=True,barchart=True,otwpower=True,empower=True)
-
+                
 		# Make Plot
 		if (make_plot):
 		    imagename = f1[:-4]+'.png'