Index: wflow-py/wflow/wf_DynamicFramework.py
===================================================================
diff -u -r1ac9ad97bb774c2cec0df8fbe1a4b25dbbf23151 -rbdd2b962a90dd8a3b47f0a47506c29092438c0c8
--- wflow-py/wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision 1ac9ad97bb774c2cec0df8fbe1a4b25dbbf23151)
+++ wflow-py/wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision bdd2b962a90dd8a3b47f0a47506c29092438c0c8)
@@ -269,7 +269,7 @@
             firstTimestep = 1
 
         # self._userModel()._setNrTimeSteps(lastTimeStep - firstTimestep + 1)
-        self._userModel()._setNrTimeSteps(lastTimeStep + 1)
+        self._userModel()._setNrTimeSteps(lastTimeStep)
         self._d_firstTimestep = 1
         self._userModel()._setFirstTimeStep(1)
         self._d_lastTimestep = lastTimeStep
@@ -665,12 +665,11 @@
                 self.timestepsecs = int(configget(self._userModel().config, 'run', 'timestepsecs', "86400"))
                 duration = self.datetime_laststep - self.datetime_firststep
                 nrseconds = duration.total_seconds()
-                self._userModel()._setNrTimeSteps(int(nrseconds / self.timestepsecs))
+                self._userModel()._setNrTimeSteps(int(nrseconds / self.timestepsecs) + 1)
                 self._userModel().timestepsecs = self.timestepsecs
                 self._d_firstTimestep = 1
                 self._userModel()._setFirstTimeStep(self._d_firstTimestep)
-                st = int(nrseconds / self.timestepsecs) + 1
-
+                self._d_lastTimestep = int(nrseconds / self.timestepsecs) + self._d_firstTimestep
             else:
                 self.logger.info(
                     "Not enough information in the [run] section. Need start and end time or a runinfo.xml file.... Reverting to default date/time")
@@ -687,11 +686,13 @@
             self._userModel().timestepsecs = self.timestepsecs
             duration = self.datetime_laststep - self.datetime_firststep
             nrseconds = duration.total_seconds()
-            self._userModel()._setNrTimeSteps(int(nrseconds / self.timestepsecs))
+            self._userModel()._setNrTimeSteps(int(nrseconds / self.timestepsecs) + 1)
             self._d_firstTimestep = 1
             self._userModel()._setFirstTimeStep(self._d_firstTimestep)
-            self._d_lastTimestep = int(nrseconds / self.timestepsecs)
+            self._d_lastTimestep = int(nrseconds / self.timestepsecs) + self._d_firstTimestep
 
+
+
         if self.ncfile != "None":
             mstacks = configsection(self._userModel().config, "inputmapstacks")
             varlst = []
@@ -707,7 +708,7 @@
             meta['runId'] = runId
             self.NcOutput = netcdfoutput(os.path.join(caseName, runId, self.ncoutfile),
                                          self.logger, self.datetime_firststep,
-                                         self._d_lastTimestep - self._d_firstTimestep,
+                                         self._userModel().nrTimeSteps(),
                                          maxbuf=buffer, metadata=meta, EPSG=self.EPSG,
                                          timestepsecs=self.timestepsecs,Format=self.ncfileformat,
                                          zlib=self.ncfilecompression,least_significant_digit=self.ncfiledigits)