Index: wflow-py/wflow/wflow_sbm2.py
===================================================================
diff -u -r6dd2645f0a818922b20a1f1dbf3dfbfac57e91a0 -r0e3a4ff42f6a43d7e03dcab7516cd91f44465391
--- wflow-py/wflow/wflow_sbm2.py	(.../wflow_sbm2.py)	(revision 6dd2645f0a818922b20a1f1dbf3dfbfac57e91a0)
+++ wflow-py/wflow/wflow_sbm2.py	(.../wflow_sbm2.py)	(revision 0e3a4ff42f6a43d7e03dcab7516cd91f44465391)
@@ -153,18 +153,18 @@
 
 
     #AvailCap is fraction of unsat zone containing roots
-    AvailCap = ifthenelse(len(UStoreLayers) == 1, min(1.0,max(RootingDepth/(WTable+1), 0.0)),
-                              ifthenelse(layerIndex<zi_layer,min(1.0,max(0.0,(RootingDepth-sumLayer) /UStoreLayerThickness)),
-                              min(1.0,max(0.0,(RootingDepth-sumLayer) /(WTable+1 - sumLayer)))))
 
+    AvailCap = ifthenelse(layerIndex<zi_layer,min(1.0,max(0.0,(RootingDepth-sumLayer) /UStoreLayerThickness)),
+                              min(1.0,max(0.0,(RootingDepth-sumLayer) /(WTable+1 - sumLayer))))
+
     MaxExtr = AvailCap * UStoreDepth
 
-    ActEvapUStore = ifthenelse(len(UStoreLayers) == 1,min(MaxExtr, RestPotEvap, UStoreDepth),
-                                   ifthenelse(layerIndex>zi_layer, ZeroMap,min(MaxExtr, RestPotEvap, UStoreDepth)))
 
-    UStoreDepth = ifthenelse(len(UStoreLayers) == 1,  UStoreDepth - ActEvapUStore,
-                        ifthenelse(layerIndex>zi_layer, ZeroMap, UStoreDepth - ActEvapUStore))
+    ActEvapUStore = ifthenelse(layerIndex>zi_layer, ZeroMap,min(MaxExtr, RestPotEvap, UStoreDepth))
 
+
+    UStoreDepth = ifthenelse(layerIndex>zi_layer, ZeroMap, UStoreDepth - ActEvapUStore)
+
     RestPotEvap = RestPotEvap - ActEvapUStore
     sumActEvapUStore = ActEvapUStore + sumActEvapUStore