diff --git a/DESCRIPTION b/DESCRIPTION
index 58ce560861f645e2c2e4801f042db7d9a077716b..481de5209390f56875800948d061aefb75420269 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.6.9.8
+Version: 1.6.9.9
 Date: 2021-01-08
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.md b/NEWS.md
index 0c92f86264eaa133f10887fb0d890a73d15e2d2a..145e53bd95478c7dcf339e76889f0ca70b2a48e6 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
 
 
 
-### 1.6.9.8 Release Notes (2021-01-08)
+### 1.6.9.9 Release Notes (2021-01-08)
 
 #### New features
 
diff --git a/R/Utils.R b/R/Utils.R
index 92a54cc1f6b3185530e8c37ba1e2f3f2efc2f22b..fe496be1d0a2e23f92ccca6b1813ed18c5e63a07 100644
--- a/R/Utils.R
+++ b/R/Utils.R
@@ -131,12 +131,6 @@
 ## InputsModel
 
 .ExtractOutputsModel <- function(x, i) {
-  IsStateEnd <- !is.null(x$StateEnd)
-  if (IsStateEnd) {
-    IsStateEnd <- TRUE
-    StateEnd <- x$StateEnd
-    x$StateEnd <- NULL
-  }
   res <- lapply(x, function(x) {
     if (is.matrix(x)  && length(dim(x)) == 2L) {
       res0 <- x[i, ]
@@ -152,8 +146,8 @@
     }
     return(res0)
   })
-  if (IsStateEnd) {
-    res$StateEnd <- StateEnd
+  if (!is.null(x$StateEnd)) {
+    res$StateEnd <- x$StateEnd
   }
   class(res) <- class(x)
   res