diff --git a/src/PeakPower.cpp b/src/PeakPower.cpp
index 5cc9f1438..3f4922438 100644
--- a/src/PeakPower.cpp
+++ b/src/PeakPower.cpp
@@ -310,8 +310,8 @@ class PeakPowerHr : public RideMetric {
 
             foreach(const RideFilePoint *point, ride->dataPoints()) {
                 if (point->secs >= start && point->secs < stop) {
-                    hr = point->hr + (points>0?hr/points:0);
                     points++;
+                    hr = (point->hr + (points-1)*hr) / (points);
                 }
             }
         }