diff --git a/opm/autodiff/FlowMain.hpp b/opm/autodiff/FlowMain.hpp
index bce66167b..61fbc984d 100644
--- a/opm/autodiff/FlowMain.hpp
+++ b/opm/autodiff/FlowMain.hpp
@@ -657,9 +657,8 @@ namespace Opm
             const Grid& grid = grid_init_->grid();
             if( output && output_ecl && output_cout_)
             {
-                EclipseWriter writer(eclipse_state_,
-                                     Opm::UgGridHelpers::numCells(grid),
-                                     Opm::UgGridHelpers::globalCell(grid));
+                const EclipseGrid& inputGrid = *eclipse_state_->getInputGrid();
+                EclipseWriter writer(eclipse_state_, UgGridHelpers::createEclipseGrid( grid , inputGrid ));
                 writer.writeInitAndEgrid(geoprops_->simProps(grid),
                                          geoprops_->nonCartesianConnections());
             }
diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
index 68f8c45bd..cca517838 100644
--- a/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
+++ b/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
@@ -336,9 +336,7 @@ namespace Opm
                      new BlackoilMatlabWriter< Grid >( grid, outputDir_ ) : 0 ),
         eclWriter_( output_ && parallelOutput_->isIORank() &&
                     param.getDefault("output_ecl", true) ?
-                    new EclipseWriter(eclipseState,
-                                      parallelOutput_->numCells(),
-                                      parallelOutput_->globalCell())
+                    new EclipseWriter(eclipseState,UgGridHelpers::createEclipseGrid( grid , *eclipseState->getInputGrid()))
                    : 0 ),
         eclipseState_(eclipseState),
         asyncOutput_()