Index: tests/test_wflow_hbv.py
===================================================================
diff -u -r2b7d608e3efc79f925e739aebc0134e9af8f84cc -r98931af4cdb5d0648a9ec78ae4c499319bdfbd69
--- tests/test_wflow_hbv.py	(.../test_wflow_hbv.py)	(revision 2b7d608e3efc79f925e739aebc0134e9af8f84cc)
+++ tests/test_wflow_hbv.py	(.../test_wflow_hbv.py)	(revision 98931af4cdb5d0648a9ec78ae4c499319bdfbd69)
@@ -66,7 +66,7 @@
 
         my_data = np.genfromtxt(os.path.join(caseName, runId, "run.csv"), delimiter=",")
         print("Checking  discharge ....")
-        self.assertAlmostEqual(1045.9403799692789, my_data[:, 2].mean(), places=4)
+        self.assertAlmostEqual(1045.9255285898844, my_data[:, 2].mean(), places=4)
 
 if __name__ == "__main__":
     unittest.main()
Index: tests/test_wflow_hbv2.py
===================================================================
diff -u -r2b7d608e3efc79f925e739aebc0134e9af8f84cc -r98931af4cdb5d0648a9ec78ae4c499319bdfbd69
--- tests/test_wflow_hbv2.py	(.../test_wflow_hbv2.py)	(revision 2b7d608e3efc79f925e739aebc0134e9af8f84cc)
+++ tests/test_wflow_hbv2.py	(.../test_wflow_hbv2.py)	(revision 98931af4cdb5d0648a9ec78ae4c499319bdfbd69)
@@ -68,7 +68,7 @@
 
         my_data = np.genfromtxt(os.path.join(caseName, runId, "run.csv"), delimiter=",")
         print("Checking  discharge ....")
-        self.assertAlmostEqual(164.16976143668094, my_data[:, 2].mean(), places=4)      
+        self.assertAlmostEqual(163.9204001436631, my_data[:, 2].mean(), places=4)      
 
 if __name__ == "__main__":
     unittest.main()
Index: wflow/wflow_hbv.py
===================================================================
diff -u -r2b7d608e3efc79f925e739aebc0134e9af8f84cc -r98931af4cdb5d0648a9ec78ae4c499319bdfbd69
--- wflow/wflow_hbv.py	(.../wflow_hbv.py)	(revision 2b7d608e3efc79f925e739aebc0134e9af8f84cc)
+++ wflow/wflow_hbv.py	(.../wflow_hbv.py)	(revision 98931af4cdb5d0648a9ec78ae4c499319bdfbd69)
@@ -480,8 +480,9 @@
             os.path.join(self.Dir, wflow_riverlength_fact), 1.0
         )
         self.BankfullDepth = pcr.cover(
-            self.wf_readmap(os.path.join(self.Dir, wflow_bankfulldepth), 0.0), 1.0
+            self.wf_readmap(os.path.join(self.Dir, wflow_bankfulldepth), 1.0), 0.0
         )
+        self.BankfullDepth = pcr.ifthenelse(self.River, self.BankfullDepth, 0.0)
 
         # read landuse and soilmap and make sure there are no missing points related to the
         # subcatchment map. Currently sets the lu and soil type  type to 1
Index: wflow/wflow_sbm.py
===================================================================
diff -u -r2b7d608e3efc79f925e739aebc0134e9af8f84cc -r98931af4cdb5d0648a9ec78ae4c499319bdfbd69
--- wflow/wflow_sbm.py	(.../wflow_sbm.py)	(revision 2b7d608e3efc79f925e739aebc0134e9af8f84cc)
+++ wflow/wflow_sbm.py	(.../wflow_sbm.py)	(revision 98931af4cdb5d0648a9ec78ae4c499319bdfbd69)
@@ -1368,8 +1368,10 @@
             os.path.join(self.Dir, wflow_riverlength_fact), 1.0
         )
         self.BankfullDepth = pcr.cover(
-            self.wf_readmap(os.path.join(self.Dir, wflow_bankfulldepth), 0.0), 1.0
+            self.wf_readmap(os.path.join(self.Dir, wflow_bankfulldepth), 1.0), 0.0
         )
+        self.BankfullDepth = pcr.ifthenelse(self.River, self.BankfullDepth, 0.0)
+        
         # read landuse and soilmap and make sure there are no missing points related to the
         # subcatchment map. Currently sets the lu and soil type  type to 1
         self.LandUse = pcr.ordinal(
Index: wflow/wflow_topoflex.py
===================================================================
diff -u -r2b7d608e3efc79f925e739aebc0134e9af8f84cc -r98931af4cdb5d0648a9ec78ae4c499319bdfbd69
--- wflow/wflow_topoflex.py	(.../wflow_topoflex.py)	(revision 2b7d608e3efc79f925e739aebc0134e9af8f84cc)
+++ wflow/wflow_topoflex.py	(.../wflow_topoflex.py)	(revision 98931af4cdb5d0648a9ec78ae4c499319bdfbd69)
@@ -647,8 +647,9 @@
             os.path.join(self.Dir, wflow_riverlength_fact), 1.0
         )
         self.BankfullDepth = pcr.cover(
-            self.wf_readmap(os.path.join(self.Dir, wflow_bankfulldepth), 0.0), 1.0
+            self.wf_readmap(os.path.join(self.Dir, wflow_bankfulldepth), 1.0), 0.0
         )
+        self.BankfullDepth = pcr.ifthenelse(self.River, self.BankfullDepth, 0.0)
         self.RiverWidth = self.wf_readmap(os.path.join(self.Dir, wflow_riverwidth), 0.0)
         self.percent = []
         for i in self.Classes: