diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
index f7dcd02b3..ede45afee 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
@@ -265,9 +265,13 @@ public class WaypointsList extends ListActivity
         if (columnIndex == timeIdx) {
           long time = cursor.getLong(timeIdx);
           TextView textView = (TextView) view;
-          textView.setText(String.format("%tc", time));
-          textView.setVisibility(
-              textView.getText().length() < 1 ? View.GONE : View.VISIBLE);
+          
+          if (time == 0) {
+            textView.setVisibility(View.GONE);
+          } else {         
+            textView.setText(String.format("%tc", time));
+            textView.setVisibility(View.VISIBLE);
+          }
         } else if (columnIndex == typeIdx) {
           int type = cursor.getInt(typeIdx);
           ImageView imageView = (ImageView) view;