diff --git a/Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp b/Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp
index 3ad71934c2..8826234c1e 100644
--- a/Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp
+++ b/Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp
@@ -1,112 +1,112 @@
 /*===================================================================
 
   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 "mitkDICOMGDCMImageFrameInfo.h"
 
 mitk::DICOMGDCMImageFrameInfo
 ::DICOMGDCMImageFrameInfo(const std::string& filename, unsigned int frameNo)
 :itk::LightObject()
 ,m_FrameInfo( DICOMImageFrameInfo::New(filename, frameNo) )
-,m_TagForValue(gdcm::Scanner::TagToValue()) // empty
+,m_TagForValue()
 {
 }
 
 mitk::DICOMGDCMImageFrameInfo
 ::DICOMGDCMImageFrameInfo(DICOMImageFrameInfo::Pointer frameinfo)
 :itk::LightObject()
 ,m_FrameInfo(frameinfo)
-,m_TagForValue(gdcm::Scanner::TagToValue()) // empty
+,m_TagForValue()
 {
 }
 
 mitk::DICOMGDCMImageFrameInfo
 ::DICOMGDCMImageFrameInfo(DICOMImageFrameInfo::Pointer frameinfo, gdcm::Scanner::TagToValue const& tagToValueMapping)
 :itk::LightObject()
 ,m_FrameInfo(frameinfo)
 ,m_TagForValue(tagToValueMapping)
 {
 }
 
 mitk::DICOMGDCMImageFrameInfo::
 ~DICOMGDCMImageFrameInfo()
 {
 }
 
 std::string
 mitk::DICOMGDCMImageFrameInfo
 ::GetTagValueAsString(const DICOMTag& tag) const
 {
   gdcm::Scanner::TagToValue::const_iterator mappedValue = m_TagForValue.find( gdcm::Tag(tag.GetGroup(), tag.GetElement()) );
 
   if (mappedValue != m_TagForValue.end())
   {
     if (mappedValue->second != NULL)
     {
       std::string s(mappedValue->second);
       return s.erase(s.find_last_not_of(" \n\r\t")+1);
     }
     else
     {
       return std::string("");
     }
   }
   else
   {
     const DICOMTag tagImagePositionPatient = DICOMTag(0x0020,0x0032); // Image Position (Patient)
     const DICOMTag    tagImageOrientation = DICOMTag(0x0020, 0x0037); // Image Orientation
 
     if (tag == tagImagePositionPatient)
     {
       return std::string("0\\0\\0");
     }
     else if (tag == tagImageOrientation)
     {
       return std::string("1\\0\\0\\0\\1\\0");
     }
     else
     {
       return std::string("");
     }
   }
 }
 
 std::string
 mitk::DICOMGDCMImageFrameInfo
 ::GetFilenameIfAvailable() const
 {
   if (m_FrameInfo.IsNotNull())
   {
     return m_FrameInfo->Filename;
   }
   else
   {
     return std::string("");
   }
 }
 
 mitk::DICOMImageFrameInfo::Pointer
 mitk::DICOMGDCMImageFrameInfo
 ::GetFrameInfo() const
 {
   return m_FrameInfo;
 }
 
 void
   mitk::DICOMGDCMImageFrameInfo
 ::SetFrameInfo(DICOMImageFrameInfo::Pointer frameinfo)
 {
   m_FrameInfo = frameinfo;
 }
diff --git a/Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.h b/Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.h
index de13c2a355..8a1be2940f 100644
--- a/Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.h
+++ b/Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.h
@@ -1,71 +1,71 @@
 /*===================================================================
 
 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 mitkDICOMGDCMImageFrameInfo_h
 #define mitkDICOMGDCMImageFrameInfo_h
 
 #include "mitkDICOMImageFrameInfo.h"
 #include "mitkDICOMDatasetAccess.h"
 
 #include "gdcmScanner.h"
 
 namespace mitk
 {
   /**
     \ingroup DICOMReaderModule
     \brief The dataset access implementation for DICOMITKSeriesGDCMReader, based on GDCM.
 
     This class combines a DICOMImageFrameInfo object with the scanning results
     from gdcm::Scanner. The scanning results will be used to implement the tag
     access methods of DICOMDatasetAccess.
   */
   class DICOMReader_EXPORT DICOMGDCMImageFrameInfo : public itk::LightObject, public DICOMDatasetAccess
   {
     public:
 
       mitkClassMacro(DICOMGDCMImageFrameInfo, itk::LightObject);
       itkNewMacro( DICOMGDCMImageFrameInfo );
       mitkNewMacro1Param( DICOMGDCMImageFrameInfo, const std::string&);
       mitkNewMacro2Param( DICOMGDCMImageFrameInfo, const std::string&, unsigned int );
       mitkNewMacro1Param( DICOMGDCMImageFrameInfo, DICOMImageFrameInfo::Pointer);
       mitkNewMacro2Param( DICOMGDCMImageFrameInfo, DICOMImageFrameInfo::Pointer, gdcm::Scanner::TagToValue const&);
 
       virtual ~DICOMGDCMImageFrameInfo();
 
       virtual std::string GetTagValueAsString(const DICOMTag&) const;
 
       std::string GetFilenameIfAvailable() const;
 
       /// The frame that this objects refers to
       DICOMImageFrameInfo::Pointer GetFrameInfo() const;
       /// The frame that this objects refers to
       void SetFrameInfo(DICOMImageFrameInfo::Pointer frameinfo);
 
     protected:
 
       DICOMImageFrameInfo::Pointer m_FrameInfo;
 
       DICOMGDCMImageFrameInfo(DICOMImageFrameInfo::Pointer frameinfo);
       DICOMGDCMImageFrameInfo(DICOMImageFrameInfo::Pointer frameinfo, gdcm::Scanner::TagToValue const& tagToValueMapping);
       DICOMGDCMImageFrameInfo(const std::string& filename = "", unsigned int frameNo = 0);
 
-      gdcm::Scanner::TagToValue const& m_TagForValue;
+      const gdcm::Scanner::TagToValue m_TagForValue;
   };
 
   typedef std::vector<DICOMGDCMImageFrameInfo::Pointer> DICOMGDCMImageFrameList;
 }
 
 #endif