diff --git a/rtgui/main.cc b/rtgui/main.cc
index d133c93be..d588b708d 100644
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -581,12 +581,13 @@ int processLineParams( int argc, char **argv )
 			continue;
 		}
 
-		// Load the image
-		ii = rtengine::InitialImage::load ( inputFile, true, &errorCode, NULL );
-		if (ii)
-			isRaw=true;
-		else
-			ii = rtengine::InitialImage::load ( inputFile , false, &errorCode, NULL );
+		// Load the image
+		isRaw = true;
+		Glib::ustring ext = getExtension (inputFile);
+		if (ext.lowercase()=="jpg" || ext.lowercase()=="jpeg" || ext.lowercase()=="tif" || ext.lowercase()=="tiff" || ext.lowercase()=="png")
+			isRaw = false;
+		
+		ii = rtengine::InitialImage::load ( inputFile, isRaw, &errorCode, NULL );
 		if (!ii) {
 			errors++;
 			std::cerr << "Error loading file: "<< inputFile << std::endl;