diff --git a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
index 16f86b131fb38eb784e3d7c35d6f634188804292..bd9677ab6e32d7467306c0b0708bd9cde3abf7a9 100644
--- a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
+++ b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
@@ -27,11 +27,11 @@
 #include "otbDEMToImageGenerator.h"
 
 #include "otbVarianceImageFilter.h"
-#include "otbBandMathImageFilter.h"
 #include "otbImageList.h"
 #include "otbImageListToVectorImageFilter.h"
 #include "otbVectorImageToImageListFilter.h"
 #include "otbBCOInterpolateImageFunction.h"
+#include "otbImageToNoDataMaskFilter.h"
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkVectorCastImageFilter.h"
@@ -239,6 +239,8 @@ public:
         FloatImageType>                             BijectionFilterType;
 
     typedef itk::ImageToImageFilter<FloatImageType,FloatImageType>  FilterType;
+
+    typedef otb::ImageToNoDataMaskFilter<FloatImageType,FloatImageType> NoDataMaskFilterType;
 private:
 
   StereoFramework()
@@ -1113,9 +1115,10 @@ private:
 
       m_Filters.push_back(disparityTranslateFilter.GetPointer());
 
-      BandMathFilterType::Pointer dispTranslateMaskFilter = BandMathFilterType::New();
-      dispTranslateMaskFilter->SetNthInput(0, disparityTranslateFilter->GetHorizontalDisparityMapOutput(), "hdisp");
-      dispTranslateMaskFilter->SetExpression("hdisp!=-32768");
+      NoDataMaskFilterType::Pointer dispTranslateMaskFilter = NoDataMaskFilterType::New();
+      dispTranslateMaskFilter->SetInput(disparityTranslateFilter->GetHorizontalDisparityMapOutput());
+      dispTranslateMaskFilter->SetInsideValue(1);
+      dispTranslateMaskFilter->SetOutsideValue(0);
       m_Filters.push_back(dispTranslateMaskFilter.GetPointer());
 
       FloatImageType::Pointer hDispOutput2 = disparityTranslateFilter->GetHorizontalDisparityMapOutput();
diff --git a/Modules/Applications/AppStereo/otb-module.cmake b/Modules/Applications/AppStereo/otb-module.cmake
index 9490e1c161f476ba771f20aa524dea4e8370eae8..c79c31609fc5a7d5e784e8e7e827c3fb6b7ccc17 100644
--- a/Modules/Applications/AppStereo/otb-module.cmake
+++ b/Modules/Applications/AppStereo/otb-module.cmake
@@ -8,6 +8,7 @@ otb_module(OTBAppStereo
     OTBITK
     OTBImageBase
     OTBImageIO
+    OTBImageManipulation
     OTBInterpolation
     OTBMathParser
     OTBObjectList