diff --git a/Modules/AlgorithmsExt/mitkSimpleUnstructuredGridHistogram.cpp b/Modules/AlgorithmsExt/mitkSimpleUnstructuredGridHistogram.cpp
index 477cb374a9..4407ad5e75 100644
--- a/Modules/AlgorithmsExt/mitkSimpleUnstructuredGridHistogram.cpp
+++ b/Modules/AlgorithmsExt/mitkSimpleUnstructuredGridHistogram.cpp
@@ -1,163 +1,163 @@
 /*===================================================================
 
 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 "mitkSimpleUnstructuredGridHistogram.h"
 
 #include <mitkUnstructuredGrid.h>
 
 #include <itkSampleToHistogramFilter.h>
 #include <vtkDataArray.h>
 #include <vtkPointData.h>
 #include <vtkUnstructuredGrid.h>
 
 namespace mitk {
 
 SimpleUnstructuredGridHistogram::SimpleUnstructuredGridHistogram()
   : m_UGHistogram(HistogramType::New()), m_InvMaxFrequency(1)
 {
   //MITK_INFO << "#######  Created a SimpleUnstructuredGridHistogram";
 }
 
 double SimpleUnstructuredGridHistogram::GetMin() const
 {
   return m_UGHistogram->GetBinMin(0, 0);
 }
 
 double SimpleUnstructuredGridHistogram::GetMax() const
 {
   return m_UGHistogram->GetBinMax(0, m_UGHistogram->GetSize(0)-1);
 }
 
 void SimpleUnstructuredGridHistogram::ComputeFromBaseData( BaseData* source )
 {
   UnstructuredGrid* grid = dynamic_cast<UnstructuredGrid*>(source);
   //m_UGHistogram->Initialize(grid);
 
   vtkUnstructuredGrid* vtkUGrid = grid->GetVtkUnstructuredGrid();
 
   ListSampleType::Pointer listSample = ListSampleType::New();
   listSample->SetMeasurementVectorSize(1);
 
   MeasurementVectorType v;
 
   MeasurementVectorType lowerBound;
   MeasurementVectorType upperBound;
 
   int numberOfBins = 1;
-  HistogramType::SizeType size;
+  HistogramType::SizeType size(1);
 
   vtkDataArray* data;
   /*if (m_UsePointData)*/ data = vtkUGrid->GetPointData()->GetScalars();
   //else data = vtkUGrid->GetCellData()->GetScalars();
 
   if (data == 0)
   {
     listSample->Resize(1);
     v[0] = 0;
     listSample->PushBack(v);
     lowerBound[0] = 0;
     upperBound[0] = 0;
     size.Fill(numberOfBins);
   }
   else
   {
     listSample->Resize(data->GetNumberOfTuples());
     for (vtkIdType i = 0; i < data->GetNumberOfTuples(); ++i)
     {
       v[0] = data->GetComponent(i, 0);
       //if (v[0] != 0) MITK_INFO << "ug scalar: " << v[0];
       listSample->PushBack(v);
     }
 
     vtkIdType numberOfTuples = data->GetNumberOfTuples();
 
     if (numberOfTuples < 1000)
       numberOfBins = 250;
     else if (numberOfTuples < 30000)
       numberOfBins = 100;
     else if (numberOfTuples < 100000)
       numberOfBins = 50;
     else
       numberOfBins = 20;
 
     size.Fill(numberOfBins);
 
     double range[2];
     data->GetRange(range);
     lowerBound[0] = range[0];
     upperBound[0] = range[1];
   }
 
   typedef itk::Statistics::SampleToHistogramFilter<ListSampleType, HistogramType> FilterType;
   FilterType::Pointer histoFilter = FilterType::New();
 
-  FilterType::HistogramMeasurementVectorType binMin;
-  FilterType::HistogramMeasurementVectorType binMax;
+  FilterType::HistogramMeasurementVectorType binMin(1);
+  FilterType::HistogramMeasurementVectorType binMax(1);
 
   binMin[0] = lowerBound[0];
   binMax[0] = upperBound[0];
 
   histoFilter->SetInput(listSample);
   histoFilter->SetHistogramSize(size);
   histoFilter->SetHistogramBinMinimum(binMin);
   histoFilter->SetHistogramBinMaximum(binMax);
   histoFilter->Update();
 
-  m_UGHistogram = histoFilter->GetOutput()->Clone();
+  m_UGHistogram = histoFilter->GetOutput();
 
   m_BinSize = (GetMax() - GetMin())/(double)numberOfBins;
 
   m_Mins = m_UGHistogram->GetMins();
   m_Maxs = m_UGHistogram->GetMaxs();
 
   HistogramType::AbsoluteFrequencyType maxFrequency = 0;
   HistogramType::SizeValueType histoSize = m_UGHistogram->GetSize(0);
   for (HistogramType::SizeValueType i = 0; i < histoSize; ++i)
   {
     HistogramType::AbsoluteFrequencyType f = m_UGHistogram->GetFrequency(i);
     if (f > maxFrequency)
     {
       maxFrequency = f;
     }
     //MITK_INFO << "Bin #" << i << ": " << m_UGHistogram->GetMeasurement(i,0);
   }
 
   if (maxFrequency)
   {
     m_InvMaxFrequency = 1.0/log((double)maxFrequency);
   }
 
   //MITK_INFO << "UGHistogramm size: " << m_UGHistogram->GetSize(0) << ", maxF: " << maxFrequency
   //    << " min count: " << m_Mins.size() << " max count: " << m_Maxs.size();
 }
 
 float SimpleUnstructuredGridHistogram::GetRelativeBin( double start, double end ) const
 {
 
 
   //MITK_INFO << "GetRelativeBin start: " << start << ", end: " << end;
   HistogramType::AbsoluteFrequencyType maxf = 0;
   for(double pos = start; pos < end; pos += m_BinSize)
   {
     HistogramType::AbsoluteFrequencyType f = m_UGHistogram->GetFrequency(m_UGHistogram->GetIndex(pos));
     if (f > maxf) maxf = f;
   }
 
   return log(static_cast<double>(maxf))*m_InvMaxFrequency;
 }
 
 }
diff --git a/Modules/AlgorithmsExt/mitkSimpleUnstructuredGridHistogram.h b/Modules/AlgorithmsExt/mitkSimpleUnstructuredGridHistogram.h
index a8fac7f008..93d3a2e5ad 100644
--- a/Modules/AlgorithmsExt/mitkSimpleUnstructuredGridHistogram.h
+++ b/Modules/AlgorithmsExt/mitkSimpleUnstructuredGridHistogram.h
@@ -1,61 +1,61 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 
 #ifndef MITKSIMPLEUNSTRUCTUREDGRIDHISTOGRAM_H
 #define MITKSIMPLEUNSTRUCTUREDGRIDHISTOGRAM_H
 
 #include <MitkAlgorithmsExtExports.h>
 
 #include "mitkSimpleHistogram.h"
 
 #include <itkListSample.h>
 
 namespace mitk {
 
 class MitkAlgorithmsExt_EXPORT SimpleUnstructuredGridHistogram : public SimpleHistogram
 {
 public:
     SimpleUnstructuredGridHistogram();
 
     virtual double GetMin() const;
     virtual double GetMax() const;
 
     virtual void ComputeFromBaseData( BaseData* source );
     virtual float GetRelativeBin( double start, double end ) const;
 
 private:
 
     typedef double MeasurementType;
     typedef itk::Vector<MeasurementType, 1> MeasurementVectorType;
     typedef itk::Statistics::ListSample<MeasurementVectorType> ListSampleType;
 
     typedef itk::Statistics::Histogram<MeasurementType> HistogramType;
 
-    HistogramType::Pointer m_UGHistogram;
+    HistogramType::ConstPointer m_UGHistogram;
 
     //UnstructuredGridHistogram::Pointer m_UGHistogram;
 
     HistogramType::BinMinContainerType m_Mins;
     HistogramType::BinMaxContainerType m_Maxs;
 
     double m_InvMaxFrequency;
     double m_BinSize;
 };
 
 }
 
 #endif // MITKSIMPLEUNSTRUCTUREDGRIDHISTOGRAM_H