diff --git a/DESCRIPTION b/DESCRIPTION
index b2be25dec8bbfc716249eb972e70332e0a35de14..a517127e0f90c09bc051d3cd465221930d762036 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.2.1
+Version: 1.6.2.2
 Date: 2020-06-05
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/R/RunModel.R b/R/RunModel.R
index 269cca120d19e7db59652aef8c146e15e1aefc43..dabe11d2aae2dda1651dede10b31eb2037b48a59 100644
--- a/R/RunModel.R
+++ b/R/RunModel.R
@@ -36,6 +36,11 @@ RunModel <- function (InputsModel, RunOptions, Param, FUN_MOD) {
           Qupstream[(2 + floor(PT[upstream_basin])):LengthTs]) *
         HUTRANS[2, upstream_basin]
     }
+    # Warning for negative flows
+    if(any(OutputsModelDown$Qsim < 0)) {
+      warning(length(which(OutputsModelDown$Qsim < 0)), " time steps with negative flow, set to zero.")
+      OutputsModelDown$Qsim[OutputsModelDown$Qsim < 0] <- 0
+    }
     # Convert back Qsim to mm
     OutputsModelDown$Qsim <- OutputsModelDown$Qsim / sum(InputsModel$BasinAreas, na.rm = TRUE) / 1E3