diff --git a/Code/Mantid/Framework/CurveFitting/src/PlotPeakByLogValue.cpp b/Code/Mantid/Framework/CurveFitting/src/PlotPeakByLogValue.cpp
index fed3dc03a8baedab197ff75b6a01ec72f58e6012..9b1b130f1f8d14759fe9eb6dc1bda8e83bbffcba 100644
--- a/Code/Mantid/Framework/CurveFitting/src/PlotPeakByLogValue.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/PlotPeakByLogValue.cpp
@@ -256,22 +256,9 @@ namespace Mantid
         std::string ext = data.name.substr(i);
         try
         {
-          API::IAlgorithm_sptr load;
-          if (ext.size() >= 2 && (ext == ".raw" || ext == ".RAW" || ext == ".add" || ext[1] == 's'))
-          {// raw file
-            load = createSubAlgorithm("LoadRaw");
-          }
-          else
-          {// nexus file
-            load = createSubAlgorithm("LoadNexus");
-          }
+          API::IAlgorithm_sptr load = createSubAlgorithm("Load");
           load->initialize();
           load->setPropertyValue("FileName",data.name);
-          //if (data.spec >= 0)
-          //{
-          //  load->setProperty("SpectrumMin",data.spec);
-          //  load->setProperty("SpectrumMax",data.spec);
-          //}
           load->execute();
           if (load->isExecuted())
           {
diff --git a/Code/Mantid/Framework/DataHandling/src/Load.cpp b/Code/Mantid/Framework/DataHandling/src/Load.cpp
index 0ea02446eee58244d8a9daade5a618b6a0e14840..5aceb22a4c3f7c5c09afbbe195df85eaca20ce26 100644
--- a/Code/Mantid/Framework/DataHandling/src/Load.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/Load.cpp
@@ -10,6 +10,9 @@
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidKernel/FacilityInfo.h"
 
+#include <cctype>
+#include <algorithm>
+
 namespace Mantid
 {
   namespace DataHandling
@@ -45,7 +48,9 @@ namespace Mantid
     void Load::setPropertyValue(const std::string &name, const std::string &value)
     {
       IDataFileChecker_sptr loader;
-      if( name == "Filename" )
+      std::string NAME(name);
+      std::transform(name.begin(),name.end(),NAME.begin(),toupper);
+      if( NAME == "FILENAME" )
       {
         // This call makes resolving the filename easier
         IDataFileChecker::setPropertyValue(name, value);
@@ -64,7 +69,7 @@ namespace Mantid
       if( loader ) declareLoaderProperties(loader);
 
       // Set the property after some may have been redeclared
-      if( name != "Filename") IDataFileChecker::setPropertyValue(name, value);
+      if( NAME != "FILENAME") IDataFileChecker::setPropertyValue(name, value);
     }
 
     //--------------------------------------------------------------------------