diff --git a/Modules/DiffusionImaging/DiffusionCore/Algorithms/Registration/mitkBatchedRegistration.cpp b/Modules/DiffusionImaging/DiffusionCore/Algorithms/Registration/mitkBatchedRegistration.cpp
index 878b052d89..c902c57a76 100644
--- a/Modules/DiffusionImaging/DiffusionCore/Algorithms/Registration/mitkBatchedRegistration.cpp
+++ b/Modules/DiffusionImaging/DiffusionCore/Algorithms/Registration/mitkBatchedRegistration.cpp
@@ -1,111 +1,114 @@
 #include "mitkBatchedRegistration.h"
 #include "mitkPyramidImageRegistrationMethod.h"
 #include "mitkDiffusionImage.h"
 
 #include <mitkRotationOperation.h>
 #include <itkScalableAffineTransform.h>
 
 mitk::BatchedRegistration::BatchedRegistration() :
   m_RegisteredImagesValid(false)
 {
 }
 
 void mitk::BatchedRegistration::SetFixedImage(mitk::Image::Pointer& fixedImage)
 {
   m_FixedImage = fixedImage;
 }
 
 void mitk::BatchedRegistration::SetMovingReferenceImage(Image::Pointer &movingImage)
 {
   m_MovingReference = movingImage;
   m_RegisteredImagesValid = false;
 }
 
 void mitk::BatchedRegistration::SetBatch(std::vector<mitk::Image::Pointer> imageBatch)
 {
   m_ImageBatch.clear();
   m_ImageBatch = imageBatch;
 }
 
 std::vector<mitk::Image::Pointer> mitk::BatchedRegistration::GetRegisteredImages()
 {
   if (!m_RegisteredImagesValid)
   {
     m_RegisteredImages.clear();
     // First transform moving reference image
     TransformType transf = GetTransformation(m_FixedImage, m_MovingReference);
     // store it as first element in vector
     m_RegisteredImages.push_back(ApplyTransformationToImage(m_MovingReference,transf));
     // apply transformation to whole batch
     std::vector<mitk::Image::Pointer>::const_iterator itEnd = m_ImageBatch.end();
     for (std::vector<mitk::Image::Pointer>::iterator it = m_ImageBatch.begin(); it != itEnd; ++it)
     {
       m_RegisteredImages.push_back(ApplyTransformationToImage(*it,transf));
     }
   }
   return m_RegisteredImages;
 }
 
 mitk::Image::Pointer mitk::BatchedRegistration::ApplyTransformationToImage(mitk::Image::Pointer &img, const mitk::BatchedRegistration::TransformType &transformation) const
 {
  // TODO: perform some magic!
   mitk::Vector3D translateVector;
   translateVector[0] = transformation.get(0,3);
   translateVector[1] = transformation.get(1,3);
   translateVector[2] = transformation.get(2,3);
   img->GetGeometry()->Translate(translateVector);
 
   itk::ScalableAffineTransform<mitk::ScalarType,3>::Pointer rotationTransform;
   itk::Matrix<mitk::ScalarType, 3,3> rotationMatrix;
   for (int i = 0; i < 3;++i)
     for (int j = 0; j < 3;++j)
       rotationMatrix[i][j] = transformation.get(i,j);
   rotationTransform  = itk::ScalableAffineTransform<mitk::ScalarType,3>::New();
   rotationTransform->SetMatrix(rotationMatrix);
   itk::ScalableAffineTransform<mitk::ScalarType,3>::Pointer geometryTransform = img->GetGeometry()->GetIndexToWorldTransform();
   geometryTransform->Compose(rotationTransform);
   img->GetGeometry()->SetIndexToWorldTransform(geometryTransform);
 
   if (dynamic_cast<mitk::DiffusionImage<short>*> (img.GetPointer()) != NULL)
   {
    // apply transformation to image geometry as well as to all gradients !?
   }
   else
   {
     // do regular stuff
   }
 
   return NULL;
 }
 
 mitk::BatchedRegistration::TransformType mitk::BatchedRegistration::GetTransformation(mitk::Image::Pointer fixedImage, mitk::Image::Pointer movingImage)
 {
   mitk::Point3D startingOrigin = movingImage->GetGeometry()->GetOrigin();
 
   mitk::PyramidImageRegistrationMethod::Pointer registrationMethod = mitk::PyramidImageRegistrationMethod::New();
   registrationMethod->SetFixedImage( fixedImage );
   registrationMethod->SetTransformToRigid();
   registrationMethod->SetCrossModalityOn();
   registrationMethod->SetMovingImage(movingImage);
   registrationMethod->Update();
   // TODO fancy shit, where you query and create a transformation type object thingy
 
   mitk::Point3D endingOrigin = registrationMethod->GetResampledMovingImage()->GetGeometry()->GetOrigin();
 
   TransformType transformation;
   mitk::PyramidImageRegistrationMethod::TransformMatrixType rotationMatrix;
   rotationMatrix = registrationMethod->GetLastRotationMatrix();
   for (unsigned int i = 0; i < 3; i++)
   {
     for (unsigned int j = 0; j < 3; ++j)
     {
-      transformation.set(i,j, *rotationMatrix[i,j]);
+      double value = rotationMatrix.get(i,j);
+      transformation.set(i,j, value);
     }
   }
-  transformation.set(0,3,endingOrigin[0] - startingOrigin[0]);
+  double value;
+  value = endingOrigin[0] - startingOrigin[0];
+  transformation.set(0,3,value);
   transformation.set(1,3,endingOrigin[1] - startingOrigin[1]);
   transformation.set(2,3,endingOrigin[2] - startingOrigin[2]);
   transformation.set(3,3,1);
 
   return transformation;
 }
\ No newline at end of file