diff --git a/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
index fa05c2169b3f4ed24980bfc8d3076a7efa2afbce..44cd046c83cccc1120dfd633862d490d0acb1987 100644
--- a/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
+++ b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
@@ -397,6 +397,9 @@ private:
         itk::MetaDataDictionary                dict                    = inImage->GetMetaDataDictionary();
         OpticalImageMetadataInterface::Pointer lImageMetadataInterface = OpticalImageMetadataInterfaceFactory::CreateIMI(dict);
 
+        //TODO : Remove, this is an Ossim compatibility layer
+        lImageMetadataInterface->SetImageMetadata(inImage->GetImageMetadata());
+
         std::string IMIName(lImageMetadataInterface->GetNameOfClass()), IMIOptDfltName("OpticalDefaultImageMetadataInterface");
         if ((IMIName != IMIOptDfltName))
         {
@@ -627,6 +630,9 @@ private:
     OpticalImageMetadataInterface::Pointer lImageMetadataInterface = OpticalImageMetadataInterfaceFactory::CreateIMI(dict);
     std::string                            IMIName(lImageMetadataInterface->GetNameOfClass());
     std::string                            IMIOptDfltName("OpticalDefaultImageMetadataInterface");
+    
+    //TODO : Remove, this is an Ossim compatibility layer
+    lImageMetadataInterface->SetImageMetadata(inImage->GetImageMetadata());
 
     // Set (Date and Day) OR FluxNormalizationCoef to corresponding filters OR solardistance
     if (IsParameterEnabled("acqui.fluxnormcoeff"))