diff --git a/app/src/main/java/de/tadris/fitness/activity/EnterWorkoutActivity.java b/app/src/main/java/de/tadris/fitness/activity/EnterWorkoutActivity.java
index 5eedca8..2a46470 100644
--- a/app/src/main/java/de/tadris/fitness/activity/EnterWorkoutActivity.java
+++ b/app/src/main/java/de/tadris/fitness/activity/EnterWorkoutActivity.java
@@ -96,7 +96,7 @@ public class EnterWorkoutActivity extends InformationActivity implements SelectW
         durationLine.lineRoot.setOnClickListener(v -> showDurationSelection());
         durationTextView = durationLine.value;
 
-        addTitle(getString(R.string.custom));
+        addTitle(getString(R.string.comment));
 
         commentEditText = new EditText(this);
         commentEditText.setSingleLine(true);
diff --git a/app/src/main/java/de/tadris/fitness/data/WorkoutBuilder.java b/app/src/main/java/de/tadris/fitness/data/WorkoutBuilder.java
index bbf801a..4aaa9f3 100644
--- a/app/src/main/java/de/tadris/fitness/data/WorkoutBuilder.java
+++ b/app/src/main/java/de/tadris/fitness/data/WorkoutBuilder.java
@@ -50,20 +50,19 @@ public class WorkoutBuilder {
 
         // Calculate values
         workout.start = start.getTimeInMillis();
+        workout.duration = duration;
         workout.end = workout.start + workout.duration;
 
         workout.id = workout.start;
         workout.setWorkoutType(workoutType);
 
-        workout.duration = duration;
-        workout.pauseDuration = 0;
-
         workout.length = length;
 
         workout.avgSpeed = (double) length / (double) (duration / 1000);
         workout.topSpeed = 0;
         workout.avgPace = ((double) workout.duration / 1000 / 60) / ((double) workout.length / 1000);
 
+        workout.pauseDuration = 0;
         workout.ascent = 0;
         workout.descent = 0;
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6681af6..00e19ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -113,7 +113,6 @@
     <string name="workoutTypeUnknown">Unknown</string>
     <string name="type">Type</string>
 
-    <string name="custom">Custom</string>
     <string name="enterWorkout">Enter Workout</string>
 
     <string name="setDuration">Set Duration</string>