diff --git a/app/src/main/java/de/tadris/fitness/recording/WorkoutSaver.java b/app/src/main/java/de/tadris/fitness/recording/WorkoutSaver.java
index 883ca7b..0c3bf96 100644
--- a/app/src/main/java/de/tadris/fitness/recording/WorkoutSaver.java
+++ b/app/src/main/java/de/tadris/fitness/recording/WorkoutSaver.java
@@ -54,6 +54,8 @@ class WorkoutSaver {
         setRealElevation();
         setAscentAndDescent();
 
+        setCalories();
+
         storeInDatabase();
     }
 
@@ -89,7 +91,6 @@ class WorkoutSaver {
         workout.length= (int)length;
         workout.avgSpeed= ((double) workout.length) / ((double) workout.duration / 1000);
         workout.avgPace= ((double)workout.duration / 1000 / 60) / ((double) workout.length / 1000);
-        workout.calorie= CalorieCalculator.calculateCalories(workout, Instance.getInstance(context).userPreferences.getUserWeight());
     }
 
     private void setTopSpeed(){
@@ -177,6 +178,11 @@ class WorkoutSaver {
 
     }
 
+    private void setCalories() {
+        // Ascent has to be set previously
+        workout.calorie = CalorieCalculator.calculateCalories(workout, Instance.getInstance(context).userPreferences.getUserWeight());
+    }
+
     private void storeInDatabase(){
         db.workoutDao().insertWorkoutAndSamples(workout, samples.toArray(new WorkoutSample[0]));
     }
diff --git a/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java b/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java
index 8b45239..ebfb002 100644
--- a/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java
+++ b/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java
@@ -25,7 +25,7 @@ public class CalorieCalculator {
 
     /**
      *
-     * workoutType, duration and avgSpeed of workout have to be set
+     * workoutType, duration, ascent and avgSpeed of workout have to be set
      *
      * @param workout the workout
      * @param weight the weight of the person in kilogram