diff --git a/app/src/main/java/svenmeier/coxswain/rower/EnergyAdjuster.java b/app/src/main/java/svenmeier/coxswain/rower/EnergyAdjuster.java
index 9c43e73..da4cca3 100644
--- a/app/src/main/java/svenmeier/coxswain/rower/EnergyAdjuster.java
+++ b/app/src/main/java/svenmeier/coxswain/rower/EnergyAdjuster.java
@@ -36,8 +36,6 @@ public class EnergyAdjuster extends Adjuster {
 
     private int weight;
 
-    private Measurement measurement;
-
 	/**
      * Calculate with {@link #DEFAULT_WEIGHT}, i.e. don't adjust.
      */
@@ -61,7 +59,7 @@ public EnergyAdjuster(Measurement measurement, int weight) {
 
     @Override
     public void setEnergy(int energy) {
-	    if (measurement.getDistance() == 0) {
+	    if (getDistance() == 0) {
             // leave unadjusted
 	        super.setEnergy(energy);
         } else {
diff --git a/changelog b/changelog
index 1d04f11..5e289a5 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,7 @@
-8.5
+8.7
+ - fixed energy adjustment
+
+8.6
   - show results after workout end
   - possible fix for export to Google Fit
   - speak seconds
diff --git a/gradle.properties b/gradle.properties
index 9c06638..106e652 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,8 +18,8 @@
 # org.gradle.parallel=true
 
 # ./gradlew githubRelease
-coxswain-versionCode=86
-coxswain-versionName=8.6
+coxswain-versionCode=87
+coxswain-versionName=8.7
 
 coxswain-private=/home/sven/Documents/coxswain/coxswain-private.gradle