diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 69bd6e2ee..e22dc054a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -364,7 +364,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
       }
       case Constants.SHOW_WAYPOINT: {
         if (results != null) {
-          final long waypointId = results.getLongExtra("waypointid", -1);
+          final long waypointId = results.getLongExtra(WaypointDetails.WAYPOINT_ID_EXTRA, -1);
           if (waypointId >= 0) {
             MapActivity map =
                 (MapActivity) getLocalActivityManager().getActivity("tab1");
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointDetails.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointDetails.java
index f8386bbb1..163e869dd 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointDetails.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointDetails.java
@@ -47,7 +47,7 @@ public class WaypointDetails extends Activity
   public static final String WAYPOINT_ID_EXTRA = "com.google.android.apps.mytracks.WAYPOINT_ID";
 
   /**
-   * The id of the way point being edited (taken from bundle, "waypointid")
+   * The id of the way point being edited (taken from bundle with the above name).
    */
   private Long waypointId;