diff --git a/Code/DisparityMap/otbStreamingWarpImageFilter.txx b/Code/DisparityMap/otbStreamingWarpImageFilter.txx
index 8018205eeca0e7cd1a7132ecfb5db8250e987556..fc825a5efa42004d0532c9de026544f9da751c10 100644
--- a/Code/DisparityMap/otbStreamingWarpImageFilter.txx
+++ b/Code/DisparityMap/otbStreamingWarpImageFilter.txx
@@ -32,7 +32,6 @@ StreamingWarpImageFilter<TInputImage,TOutputImage,TDeformationField>
 ::StreamingWarpImageFilter()
 {
   // Fill the default maximum deformation
-  m_MaximumDeformation.SetSize(InputImageType::ImageDimension);
   m_MaximumDeformation.Fill(1);
 }
 
diff --git a/Testing/Code/DisparityMap/otbStreamingWarpImageFilter.cxx b/Testing/Code/DisparityMap/otbStreamingWarpImageFilter.cxx
index b2d8f157b7a5346c5f49356702699c8d53b0c58d..cd136dca3024aa58decb4743b78488bf4dda3dff 100644
--- a/Testing/Code/DisparityMap/otbStreamingWarpImageFilter.cxx
+++ b/Testing/Code/DisparityMap/otbStreamingWarpImageFilter.cxx
@@ -15,14 +15,13 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbImage.h"
 #include "otbVectorImage.h"
+#include "itkVector.h"
+#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbStreamingImageFileWriter.h"
-
 #include "otbStreamingWarpImageFilter.h"
 
-
 int otbStreamingWarpImageFilter(int argc, char* argv[])
 {
   if(argc!=5)
@@ -41,7 +40,8 @@ int otbStreamingWarpImageFilter(int argc, char* argv[])
   const unsigned int Dimension=2;
   typedef double PixelType;
   typedef otb::Image<PixelType,Dimension> ImageType;
-  typedef otb::VectorImage<PixelType,Dimension> DeformationFieldType;
+  typedef itk::Vector<PixelType,2> DeformationValueType;
+  typedef otb::Image<DeformationValueType,Dimension> DeformationFieldType;
   
   // Warper
   typedef otb::StreamingWarpImageFilter<ImageType,ImageType,DeformationFieldType> ImageWarperType;
@@ -62,7 +62,7 @@ int otbStreamingWarpImageFilter(int argc, char* argv[])
   deformationReader->SetFileName(deffname);
 
   // Warping 
-  ImageWarperType::DeformationValueType maxDeformation;
+  DeformationValueType maxDeformation;
   maxDeformation.Fill(maxdef);
   warper->SetMaximumDeformation(maxDeformation);
   warper->SetInput(reader->GetOutput());
diff --git a/Testing/Code/DisparityMap/otbStreamingWarpImageFilterNew.cxx b/Testing/Code/DisparityMap/otbStreamingWarpImageFilterNew.cxx
index 62499b69d0a585d8dd5700c5b10ab7c570b88e38..e1279094ae256121b3308aba81f3231dc3e3d8a7 100644
--- a/Testing/Code/DisparityMap/otbStreamingWarpImageFilterNew.cxx
+++ b/Testing/Code/DisparityMap/otbStreamingWarpImageFilterNew.cxx
@@ -16,21 +16,18 @@
 
 =========================================================================*/
 #include "otbImage.h"
-#include "otbVectorImage.h"
-#include "otbImageFileReader.h"
-#include "otbStreamingImageFileWriter.h"
-
+#include "itkVector.h"
 #include "otbStreamingWarpImageFilter.h"
 
-
 int otbStreamingWarpImageFilterNew(int argc, char* argv[])
 {
   // Images definition
   const unsigned int Dimension=2;
   typedef double PixelType;
+  typedef itk::Vector<PixelType,2> DeformationValueType;
   typedef otb::Image<PixelType,Dimension> ImageType;
-  typedef otb::VectorImage<PixelType,Dimension> DeformationFieldType;
-  
+  typedef otb::Image<DeformationValueType,2> DeformationFieldType;
+
   // Warper
   typedef otb::StreamingWarpImageFilter<ImageType,ImageType,DeformationFieldType> ImageWarperType;