Index: mitkGeometry3D.cpp
===================================================================
--- mitkGeometry3D.cpp	(revision 19604)
+++ mitkGeometry3D.cpp	(working copy)
@@ -142,7 +142,12 @@
 
 void mitk::Geometry3D::IndexToWorld(const mitk::Point3D &pt_units, mitk::Point3D &pt_mm) const
 {
-  pt_mm = m_IndexToWorldTransform->TransformPoint(pt_units);
+  mitk::Point3D temp = pt_units;
+  if(m_ImageGeometry)
+  {
+    temp -= 0.5;
+  }
+  pt_mm = m_IndexToWorldTransform->TransformPoint(temp);
 }
 
 void mitk::Geometry3D::WorldToIndex(const mitk::Point3D &atPt3d_mm, const mitk::Vector3D &vec_mm, mitk::Vector3D &vec_units) const
@@ -351,6 +356,11 @@
       ++nans;
     }
   }
+
+  if(m_ImageGeometry)
+  {
+    out+=0.5;
+  }
   
   if (nans > 0)
   {
@@ -563,7 +573,7 @@
   case 5: FillVector3D(cornerpoint, bounds[1],bounds[2],bounds[5]); break;
   case 6: FillVector3D(cornerpoint, bounds[1],bounds[3],bounds[4]); break;
   case 7: FillVector3D(cornerpoint, bounds[1],bounds[3],bounds[5]); break;
-  default: assert(id < 8);
+  default: return NULL;
   }
   if(m_ImageGeometry)
   {