diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
index 42595ee16..64e969a5d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
@@ -860,13 +860,14 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
         return;
       }
 
-      while (cursor.moveToNext()) {
+      do {
         Location location = createLocation(cursor);
         if (location == null) {
           continue;
         }
         buffer.add(location, cursor.getLong(idColumnIdx));
-      }
+      } while (cursor.moveToNext());
+      
       if (buffer.getLocationsLoaded() == 0) {
         Log.w(MyTracksProvider.TAG, "No locations read.");
         buffer.resetAt(startingPoint + buffer.getSize());
diff --git a/MyTracks/src/com/google/android/apps/mytracks/stats/TripStatistics.java b/MyTracks/src/com/google/android/apps/mytracks/stats/TripStatistics.java
index 85c7f421c..160c237f6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/stats/TripStatistics.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/stats/TripStatistics.java
@@ -159,7 +159,7 @@ public class TripStatistics implements Parcelable {
    *         stopped
    */
   public long getStopTime() {
-    return startTime;
+    return stopTime;
   }
 
   /**