diff --git a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXMapper3D.cpp b/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXMapper3D.cpp
index 31aa03a47a..3d4d2c1a2e 100644
--- a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXMapper3D.cpp
+++ b/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXMapper3D.cpp
@@ -1,142 +1,157 @@
 /*===================================================================
 
 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 "mitkFiberBundleXMapper3D.h"
 #include <mitkProperties.h>
 //#include <mitkFiberBundleInteractor.h>
 //#include <mitkGlobalInteraction.h>
 
 #include <vtkPropAssembly.h>
 #include <vtkPointData.h>
 #include <vtkProperty.h>
 #include <vtkCellArray.h>
+#include <vtkDepthSortPolyData.h>
+#include <vtkCamera.h>
 
 //not essential for mapper
 // #include <QTime>
 
 mitk::FiberBundleXMapper3D::FiberBundleXMapper3D()
 {
     m_lut = vtkLookupTable::New();
     m_lut->Build();
 }
 
 
 mitk::FiberBundleXMapper3D::~FiberBundleXMapper3D()
 {
 
 }
 
 
 const mitk::FiberBundleX* mitk::FiberBundleXMapper3D::GetInput()
 {
     return static_cast<const mitk::FiberBundleX * > ( GetDataNode()->GetData() );
 }
 
 
 /*
  This method is called once the mapper gets new input,
  for UI rotation or changes in colorcoding this method is NOT called
  */
 void mitk::FiberBundleXMapper3D::InternalGenerateData(mitk::BaseRenderer *renderer)
 {
     mitk::FiberBundleX* fiberBundle = dynamic_cast<mitk::FiberBundleX*> (GetDataNode()->GetData());
     if (fiberBundle == NULL)
         return;
 
     vtkSmartPointer<vtkPolyData> fiberPolyData = fiberBundle->GetFiberPolyData();
     if (fiberPolyData == NULL)
         return;
 
-    FBXLocalStorage3D *localStorage = m_LocalStorageHandler.GetLocalStorage(renderer);
-
+    fiberPolyData->GetPointData()->AddArray(fiberBundle->GetFiberColors());
     float tmpopa;
     this->GetDataNode()->GetOpacity(tmpopa, NULL);
-    fiberPolyData->GetPointData()->AddArray(fiberBundle->GetFiberColors());
-    localStorage->m_FiberMapper->SetInputData(fiberPolyData);
+    FBXLocalStorage3D *localStorage = m_LocalStorageHandler.GetLocalStorage(renderer);
+
+    if (tmpopa<1)
+    {
+        vtkSmartPointer<vtkDepthSortPolyData> depthSort = vtkSmartPointer<vtkDepthSortPolyData>::New();
+        depthSort->SetInputData( fiberPolyData );
+        depthSort->SetCamera( renderer->GetVtkRenderer()->GetActiveCamera() );
+        depthSort->SetDirectionToFrontToBack();
+        depthSort->Update();
+        localStorage->m_FiberMapper->SetInputConnection(depthSort->GetOutputPort());
+    }
+    else
+    {
+        localStorage->m_FiberMapper->SetInputData(fiberPolyData);
+    }
+
     localStorage->m_FiberMapper->SelectColorArray("FIBER_COLORS");
     localStorage->m_FiberMapper->ScalarVisibilityOn();
     localStorage->m_FiberMapper->SetScalarModeToUsePointFieldData();
     localStorage->m_FiberActor->SetMapper(localStorage->m_FiberMapper);
     localStorage->m_FiberMapper->SetLookupTable(m_lut);
 
     // set Opacity
     localStorage->m_FiberActor->GetProperty()->SetOpacity((double) tmpopa);
 
     int lineWidth = 1;
     this->GetDataNode()->GetIntProperty("LineWidth",lineWidth);
     localStorage->m_FiberActor->GetProperty()->SetLineWidth(lineWidth);
 
     localStorage->m_FiberAssembly->AddPart(localStorage->m_FiberActor);
     localStorage->m_LastUpdateTime.Modified();
 }
 
 
 
 void mitk::FiberBundleXMapper3D::GenerateDataForRenderer( mitk::BaseRenderer *renderer )
 {
     bool visible = true;
     GetDataNode()->GetVisibility(visible, renderer, "visible");
     if ( !visible ) return;
 
     const DataNode* node = this->GetDataNode();
     FBXLocalStorage3D* localStorage = m_LocalStorageHandler.GetLocalStorage(renderer);
     mitk::FiberBundleX* fiberBundle = dynamic_cast<mitk::FiberBundleX*>(node->GetData());
     if (localStorage->m_LastUpdateTime>=fiberBundle->GetUpdateTime3D())
         return;
 
     // Calculate time step of the input data for the specified renderer (integer value)
     // this method is implemented in mitkMapper
     this->CalculateTimeStep( renderer );
     this->InternalGenerateData(renderer);
 }
 
 
 void mitk::FiberBundleXMapper3D::SetDefaultProperties(mitk::DataNode* node, mitk::BaseRenderer* renderer, bool overwrite)
 {
     Superclass::SetDefaultProperties(node, renderer, overwrite);
     node->AddProperty( "LineWidth", mitk::IntProperty::New( true ), renderer, overwrite );
     node->AddProperty( "opacity", mitk::FloatProperty::New( 1.0 ), renderer, overwrite);
     node->AddProperty( "color", mitk::ColorProperty::New(1.0,1.0,1.0), renderer, overwrite);
     node->AddProperty( "pickable", mitk::BoolProperty::New( true ), renderer, overwrite);
 }
 
 vtkProp* mitk::FiberBundleXMapper3D::GetVtkProp(mitk::BaseRenderer *renderer)
 {
     //MITK_INFO << "FiberBundleXxXXMapper3D()GetVTKProp";
     //this->GenerateData();
     return m_LocalStorageHandler.GetLocalStorage(renderer)->m_FiberAssembly;
 
 }
 
 void mitk::FiberBundleXMapper3D::UpdateVtkObjects()
 {
 
 }
 
 void mitk::FiberBundleXMapper3D::SetVtkMapperImmediateModeRendering(vtkMapper *)
 {
 
 }
 
 mitk::FiberBundleXMapper3D::FBXLocalStorage3D::FBXLocalStorage3D()
 {
     m_FiberActor = vtkSmartPointer<vtkActor>::New();
     m_FiberMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
     m_FiberAssembly = vtkSmartPointer<vtkPropAssembly>::New();
 }