diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/ConvPar_GF2020.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/ConvPar_GF2020.F90
index 3fcf052e1..bd0518859 100644
--- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/ConvPar_GF2020.F90
+++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/ConvPar_GF2020.F90
@@ -8087,7 +8087,8 @@ SUBROUTINE rain_evap_below_cloudbase(cumulus,itf,ktf, its,ite, kts,kte,ierr,kbco
                       ( sqrt(po_cup(i,k)/psur(i))/alpha2 * prec_flx(i,k+1)/eff_c_conv(i) )**alpha3
 
          !--units here: kg[water]/kg[air}/sec * kg[air]/m3 * m = kg[water]/m2/sec
-         evap_bcb(i,k)= evap_bcb(i,k)*dp/g
+         !--Limit to ensure precip is non-negative
+         evap_bcb(i,k)= min(evap_bcb(i,k)*dp/g,0.9999*(xmb(i)*(pwo(i,k) + edto(i)*pwdo(i,k))+prec_flx(i,k+1)))
 
         else
 
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_UW_InterfaceMod.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_UW_InterfaceMod.F90
index fd9cb4e26..aa8238324 100644
--- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_UW_InterfaceMod.F90
+++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_UW_InterfaceMod.F90
@@ -695,13 +695,13 @@ subroutine UW_Run (GC, IMPORT, EXPORT, CLOCK, RC)
            CLCN(i,j,k) = MAX(0.0, MIN(CLCN(i,j,k) + DQADT_SC(i,j,k)*MOIST_DT, 1.0))
            
            ! Add detrained shallow convective ice/liquid source
-           QLCN(i,j,k) = MAX(0.0, QLCN(i,j,k) + QLDET_SC(i,j,k)*MOIST_DT/MASS(i,j,k))
-           QICN(i,j,k) = MAX(0.0, QICN(i,j,k) + QIDET_SC(i,j,k)*MOIST_DT/MASS(i,j,k))
+           QLCN(i,j,k) = QLCN(i,j,k) + QLDET_SC(i,j,k)*MOIST_DT/MASS(i,j,k)
+           QICN(i,j,k) = QICN(i,j,k) + QIDET_SC(i,j,k)*MOIST_DT/MASS(i,j,k)
            
            ! Apply condensate tendency from subsidence, and sink from
            ! condensate entrained into shallow updraft. 
-           QLLS(i,j,k) = MAX(0.0, QLLS(i,j,k) + (QLSUB_SC(i,j,k)+QLENT_SC(i,j,k))*MOIST_DT)
-           QILS(i,j,k) = MAX(0.0, QILS(i,j,k) + (QISUB_SC(i,j,k)+QIENT_SC(i,j,k))*MOIST_DT)
+           QLLS(i,j,k) = QLLS(i,j,k) + (QLSUB_SC(i,j,k)+QLENT_SC(i,j,k))*MOIST_DT
+           QILS(i,j,k) = QILS(i,j,k) + (QISUB_SC(i,j,k)+QIENT_SC(i,j,k))*MOIST_DT
 
            ! Get export QL/QI tendencies
            DQLDT_SC(i,j,k) = (QLLS(i,j,k) + QLCN(i,j,k) - DQLDT_SC(i,j,k)) / MOIST_DT