diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py
index 9641a41a..dd345736 100644
--- a/rowers/c2stuff.py
+++ b/rowers/c2stuff.py
@@ -300,10 +300,14 @@ def summaryfromsplitdata(splitdata,data,filename,sep='|'):
 
         sa += iarr
         results += resarr
+
+        if itime != 0:
+            ivelo = idist/itime
+            ipower = 2.8*ivelo**(3.0)
+        else:
+            ivelo = 0
+            ipower = 0
             
-        ivelo = idist/itime
-        ipower = 2.8*ivelo**(3.0)
-        
         sums += interval_string(intervalnr,idist,itime,ipace,ispm,
                                 iavghr,imaxhr,0,ipower,separator=sep)
         intervalnr+=1
diff --git a/rowers/tests/testdata/testdata.tcx b/rowers/tests/testdata/testdata.tcx
index 6685750c..adb19770 100644
--- a/rowers/tests/testdata/testdata.tcx
+++ b/rowers/tests/testdata/testdata.tcx
@@ -2502,7 +2502,11 @@
           </Trackpoint>
         </Track>
       </Lap>
+<<<<<<< HEAD
       <Notes>&lt;Element 'Notes' at 0x13db9b70&gt;</Notes>
+=======
+      <Notes>&lt;Element 'Notes' at 0x11aaf780&gt;</Notes>
+>>>>>>> develop
     </Activity>
   </Activities>
   <Creator>