diff --git a/.buildlibrary b/.buildlibrary
index 2eba8212..e478f66f 100644
--- a/.buildlibrary
+++ b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '33582803'
+ValidationKey: '33602362'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'
diff --git a/CITATION.cff b/CITATION.cff
index cbb706db..885c0764 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -2,7 +2,7 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'mrwater: madrat based MAgPIE water Input Data Library'
-version: 1.7.17
+version: 1.7.18
 date-released: '2023-07-21'
 abstract: Provides functions for MAgPIE cellular input data generation and stand-alone
   water calculations.
diff --git a/DESCRIPTION b/DESCRIPTION
index e2102ef6..22ad4d7a 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: mrwater
 Title: madrat based MAgPIE water Input Data Library
-Version: 1.7.17
+Version: 1.7.18
 URL: https://github.com/pik-piam/mrwater, 
 https: //doi.org/10.5281/zenodo.5801680
 License: LGPL-3 | file LICENSE
diff --git a/R/toolNeighborUpDownProvision.R b/R/toolNeighborUpDownProvision.R
index 28e2e105..3d517ecd 100755
--- a/R/toolNeighborUpDownProvision.R
+++ b/R/toolNeighborUpDownProvision.R
@@ -140,7 +140,7 @@ toolNeighborUpDownProvision <- function(rs, transDist,
 
           # Select cells to be calculated
           cellsCalc <- unique(c(which(tmpRequestWWlocal > 0),
-                                which(tmpDischarge[c] + tmpPrevWC[c] < tmpPrevWW[c])))
+                                which(tmpDischarge + tmpPrevWC < tmpPrevWW)))
           cellsCalc <- unique(c(cellsCalc, unlist(rs$downstreamcells[cellsCalc])))
           cellsCalc <- cellsCalc[order(rs$calcorder[cellsCalc], decreasing = FALSE)]
 
diff --git a/README.md b/README.md
index 6b6ae860..9f83720b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # madrat based MAgPIE water Input Data Library
 
-R package **mrwater**, version **1.7.17**
+R package **mrwater**, version **1.7.18**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/mrwater)](https://cran.r-project.org/package=mrwater)  [![R build status](https://github.com/pik-piam/mrwater/workflows/check/badge.svg)](https://github.com/pik-piam/mrwater/actions) [![codecov](https://codecov.io/gh/pik-piam/mrwater/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrwater) [![r-universe](https://pik-piam.r-universe.dev/badges/mrwater)](https://pik-piam.r-universe.dev/builds)
 
@@ -48,7 +48,7 @@ In case of questions / problems please contact Felicitas Beier <beier@pik-potsda
 
 To cite package **mrwater** in publications use:
 
-Beier F, Heinke J, Karstens K, Bodirsky B, Dietrich J (2023). _mrwater: madrat based MAgPIE water Input Data Library_. R package version 1.7.17, <https://github.com/pik-piam/mrwater>.
+Beier F, Heinke J, Karstens K, Bodirsky B, Dietrich J (2023). _mrwater: madrat based MAgPIE water Input Data Library_. R package version 1.7.18, <https://github.com/pik-piam/mrwater>.
 
 A BibTeX entry for LaTeX users is
 
@@ -57,7 +57,7 @@ A BibTeX entry for LaTeX users is
   title = {mrwater: madrat based MAgPIE water Input Data Library},
   author = {Felicitas Beier and Jens Heinke and Kristine Karstens and Benjamin Leon Bodirsky and Jan Philipp Dietrich},
   year = {2023},
-  note = {R package version 1.7.17},
+  note = {R package version 1.7.18},
   url = {https://github.com/pik-piam/mrwater},
 }
 ```