diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
index dcc3f62..028b1d2 100644
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -951,7 +951,7 @@
      */
 	class JpegFileFilter implements FilenameFilter{
     	public boolean accept(File dir, String name) {
-			if (name.matches(".*\\.JPG$")) {
+			if (name.toUpperCase().matches(".*\\.JPG$")) {
 				return true;
 			}
 			return false;
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
index 12d1a04..39878c0 100644
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
+++ b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
@@ -400,9 +400,6 @@
     	String path = (new File(arg1_srcFolder.getText(), arg2_baseTimeImg.getText())).getPath();
     	
     	File timeFile = new File(path);
-    	long lastModifyTime = timeFile.lastModified();
-    	arg3_basetiome.argField.setText(ImportPicture.dfjp.format(new Date(lastModifyTime)));
-
     	if (exifBase.isSelected()) {
         	try {
             	ImageMetadata meta = Imaging.getMetadata(timeFile);
@@ -411,7 +408,7 @@
                     TiffImageMetadata exif = jpegMetadata.getExif();
                     if (exif != null) {
                     	String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0];
-                    	lastModifyTime = (new SimpleDateFormat("yyyy:MM:dd HH:mm:ss")).parse(dateTimeOriginal).getTime();
+                    	long lastModifyTime = (new SimpleDateFormat("yyyy:MM:dd HH:mm:ss")).parse(dateTimeOriginal).getTime();
                     	arg3_basetiome.argField.setText(ImportPicture.dfjp.format(new Date(lastModifyTime)));
                     }
                     else {
@@ -421,6 +418,10 @@
         	}
         	catch (Exception e) {}
     	}
+    	else {
+        	long lastModifyTime = timeFile.lastModified();
+    		arg3_basetiome.argField.setText(ImportPicture.dfjp.format(new Date(lastModifyTime)));
+    	}
     	
     	int size_x = imageSPane.getWidth() - 8;
     	ImageIcon tmpIcon = new ImageIcon(path);