diff --git a/Modules/DiffusionImaging/DiffusionCmdApps/mitkDiffusionDataIOHelper.cpp b/Modules/DiffusionImaging/DiffusionCmdApps/mitkDiffusionDataIOHelper.cpp
index 201f548b87..fea9ae9bbf 100644
--- a/Modules/DiffusionImaging/DiffusionCmdApps/mitkDiffusionDataIOHelper.cpp
+++ b/Modules/DiffusionImaging/DiffusionCmdApps/mitkDiffusionDataIOHelper.cpp
@@ -1,127 +1,127 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "mitkDiffusionDataIOHelper.h"
 
 std::vector< std::string > mitk::DiffusionDataIOHelper::get_file_list(const std::string& path, const std::vector<std::string> extensions)
 {
   std::vector< std::string > file_list;
   itk::Directory::Pointer dir = itk::Directory::New();
 
   if (dir->Load(path.c_str()))
   {
     int n = dir->GetNumberOfFiles();
     for (int r = 0; r < n; r++)
     {
       const char *filename = dir->GetFile(r);
       std::string ext = ist::GetFilenameExtension(filename);
       for (auto e : extensions)
       {
         if (ext==e)
         {
           file_list.push_back(path + '/' + filename);
           break;
         }
       }
     }
   }
   std::sort(file_list.begin(), file_list.end());
   return file_list;
 }
 
 std::vector< mitk::Image::Pointer > mitk::DiffusionDataIOHelper::load_mitk_images(const std::vector<std::string> files, std::vector<std::string>* filenames)
 {
   mitk::LocaleSwitch localeSwitch("C");
   std::streambuf *old = cout.rdbuf(); // <-- save
   std::stringstream ss;
   std::cout.rdbuf (ss.rdbuf());       // <-- redirect
   std::vector< mitk::Image::Pointer > out;
   for (auto f : files)
   {
     if (itksys::SystemTools::FileExists(f, true))
     {
       mitk::Image::Pointer image = mitk::IOUtil::Load<mitk::Image>(f);
       if (image.IsNotNull())
       {
         out.push_back(image);
         if (filenames!=nullptr)
           filenames->push_back(f);
       }
     }
     else if (itksys::SystemTools::PathExists(f))
     {
       if (!f.empty() && f.back() != '/')
         f += "/";
 
       auto list = get_file_list(f, {".nrrd",".nii.gz",".nii"});
       for (auto file : list)
       {
         mitk::Image::Pointer image = mitk::IOUtil::Load<mitk::Image>(file);
         if (image.IsNotNull())
         {
           out.push_back(image);
           if (filenames!=nullptr)
             filenames->push_back(file);
         }
       }
     }
   }
 
   std::cout.rdbuf (old);              // <-- restore
   MITK_INFO << "Loaded " << out.size() << " images";
   return out;
 }
 
 std::vector< mitk::FiberBundle::Pointer > mitk::DiffusionDataIOHelper::load_fibs(const std::vector<std::string> files, std::vector<std::string>* filenames)
 {
   std::streambuf *old = cout.rdbuf(); // <-- save
   std::stringstream ss;
   std::cout.rdbuf (ss.rdbuf());       // <-- redirect
   std::vector< mitk::FiberBundle::Pointer > out;
   for (auto f : files)
   {
-    if (itksys::SystemTools::PathExists(f))
+    if (itksys::SystemTools::FileExists(f, true))
+    {
+      mitk::FiberBundle::Pointer fib = mitk::IOUtil::Load<mitk::FiberBundle>(f);
+      if (fib.IsNotNull())
+      {
+        out.push_back(fib);
+        if (filenames!=nullptr)
+          filenames->push_back(f);
+      }
+    }
+    else if (itksys::SystemTools::PathExists(f))
     {
       if (!f.empty() && f.back() != '/')
         f += "/";
 
       auto list = get_file_list(f, {".fib",".trk",".tck"});
       for (auto file : list)
       {
         mitk::FiberBundle::Pointer fib = mitk::IOUtil::Load<mitk::FiberBundle>(file);
         if (fib.IsNotNull())
         {
           out.push_back(fib);
           if (filenames!=nullptr)
             filenames->push_back(file);
         }
       }
     }
-    else if (itksys::SystemTools::FileExists(f))
-    {
-      mitk::FiberBundle::Pointer fib = mitk::IOUtil::Load<mitk::FiberBundle>(f);
-      if (fib.IsNotNull())
-      {
-        out.push_back(fib);
-        if (filenames!=nullptr)
-          filenames->push_back(f);
-      }
-    }
   }
   std::cout.rdbuf (old);              // <-- restore
   MITK_INFO << "Loaded " << out.size() << " tractograms";
   return out;
 }