diff --git a/source/RunPowerWorkoutView.mc b/source/RunPowerWorkoutView.mc
index c6130a6..2cde1a5 100644
--- a/source/RunPowerWorkoutView.mc
+++ b/source/RunPowerWorkoutView.mc
@@ -1604,10 +1604,7 @@ class RunPowerWorkoutView extends WatchUi.DataField {
       label = "LP "+paceLabel;
       value = lapSpeed == null ? 0 : Utils.convert_speed_pace(lapSpeed, useMetric, useSpeed);
     } else if (type == '6') {
-      if(stepType >= 98){
-           return (lapPower == null ? 0 : (lapPower + 0.5).toNumber());
-        } 
-      else if (stepPower != null) {
+      if (stepPower != null) {
         if (stepType < 98 && targetHigh != 0 && targetLow != 0) {
           if (showColors == 1 && !single) {
             if (stepPower < targetLow) {
@@ -1631,7 +1628,11 @@ class RunPowerWorkoutView extends WatchUi.DataField {
         }
       }
       label = "STP PWR";
-      value = stepPower == null ? 0 : (stepPower + 0.5).toNumber();
+        if(stepType >= 98){
+           value = lapPower == null ? 0 : (lapPower + 0.5).toNumber();
+        } else {
+          value = stepPower == null ? 0 : (stepPower + 0.5).toNumber();
+        }
     } else if(type == '7') {
       label = "LAP PWR";
       value = lapPower == null ? 0 : (lapPower + 0.5).toNumber();