diff --git a/src/com/android/gallery3d/data/MediaDetails.java b/src/com/android/gallery3d/data/MediaDetails.java
index dbb65fe..0dd9cb8 100755
--- a/src/com/android/gallery3d/data/MediaDetails.java
+++ b/src/com/android/gallery3d/data/MediaDetails.java
@@ -171,12 +171,9 @@
                     focalTag.getValueAsRational(0).toDouble());
             details.setUnit(MediaDetails.INDEX_FOCAL_LENGTH, R.string.unit_mm);
         }
-        ExifTag latitudeTag = exif.getTag(ExifInterface.TAG_GPS_LATITUDE);
-        ExifTag longitudeTag = exif.getTag(ExifInterface.TAG_GPS_LONGITUDE);
-        if (latitudeTag != null && longitudeTag != null) {
-            double latitude = latitudeTag.getValueAsRational(0).toDouble();
-            double longitude = longitudeTag.getValueAsRational(0).toDouble();
-            details.addDetail(MediaDetails.INDEX_LOCATION, new double[] {latitude, longitude});
+        double[] latLong = exif.getLatLongAsDoubles();
+        if (latLong != null) {
+            details.addDetail(MediaDetails.INDEX_LOCATION, latLong);
         }
     }
 }
