diff --git a/src/FitRideFile.cpp b/src/FitRideFile.cpp
index 3445ca0ea..c97cd42aa 100644
--- a/src/FitRideFile.cpp
+++ b/src/FitRideFile.cpp
@@ -554,7 +554,7 @@ struct FitFileReaderState
                 case 68: // ? Right Platform Center Offset ?
                         rightPedalCenterOffset = value;
                         break;
-                case 69: // ? Left Power Phase (Top and Bottom Dead Center)  ?
+                case 69: // ? Left Power Phase ?
                         leftTopDeathCenter = round(value * 360.0/256);
                         leftBottomDeathCenter = round(value2 * 360.0/256);
                         break;
@@ -562,7 +562,7 @@ struct FitFileReaderState
                         leftTopPeakPowerPhase = round(value * 360.0/256);
                         leftBottomPeakPowerPhase = round(value2 * 360.0/256);
                         break;
-                case 71: // ? Right Power Phase (Top and Bottom Dead Center)  ?
+                case 71: // ? Right Power Phase ?
                         rightTopDeathCenter = round(value * 360.0/256);
                         rightBottomDeathCenter = round(value2 * 360.0/256);
                         break;
diff --git a/src/RideFileTableModel.cpp b/src/RideFileTableModel.cpp
index b55ae0262..bf655a75a 100644
--- a/src/RideFileTableModel.cpp
+++ b/src/RideFileTableModel.cpp
@@ -153,14 +153,14 @@ RideFileTableModel::setHeadings(RideFile::SeriesType series)
             headings_ << tr("Left Power Phase Start");
             headingsType << RideFile::lppb;
         }
-        if (series == RideFile::rppb || ride->areDataPresent()->rppb) {
-            headings_ << tr("Right Power Phase Start");
-            headingsType << RideFile::rppb;
-        }
         if (series == RideFile::lppe || ride->areDataPresent()->lppe) {
             headings_ << tr("Left Power Phase End");
             headingsType << RideFile::lppe;
         }
+        if (series == RideFile::rppb || ride->areDataPresent()->rppb) {
+            headings_ << tr("Right Power Phase Start");
+            headingsType << RideFile::rppb;
+        }
         if (series == RideFile::rppe || ride->areDataPresent()->rppe) {
             headings_ << tr("Right Power Phase End");
             headingsType << RideFile::rppe;
@@ -169,9 +169,17 @@ RideFileTableModel::setHeadings(RideFile::SeriesType series)
             headings_ << tr("Left Peak Power Phase Start");
             headingsType << RideFile::lpppb;
         }
-        if (series == RideFile::rpppb || ride->areDataPresent()->rpppb) {
+        if (series == RideFile::lpppe || ride->areDataPresent()->lpppe) {
+            headings_ << tr("Left Peak Power Phase End");
+            headingsType << RideFile::lpppe;
+        }
+        if (series == RideFile::lpppb || ride->areDataPresent()->rpppb) {
             headings_ << tr("Right Peak Power Phase Start");
-            headingsType << RideFile::rpppb;
+            headingsType << RideFile::lpppb;
+        }
+        if (series == RideFile::rpppe || ride->areDataPresent()->rpppe) {
+            headings_ << tr("Right Peak Power Phase End");
+            headingsType << RideFile::rpppe;
         }
         if (series == RideFile::smo2 || ride->areDataPresent()->smo2) {
             headings_ << tr("SmO2");