diff --git a/src/Components/GEOSldas_GridComp/GEOSlandassim_GridComp/clsm_ensupd_upd_routines.F90 b/src/Components/GEOSldas_GridComp/GEOSlandassim_GridComp/clsm_ensupd_upd_routines.F90
index 87db1a7f..c8710d6e 100644
--- a/src/Components/GEOSldas_GridComp/GEOSlandassim_GridComp/clsm_ensupd_upd_routines.F90
+++ b/src/Components/GEOSldas_GridComp/GEOSlandassim_GridComp/clsm_ensupd_upd_routines.F90
@@ -4419,20 +4419,24 @@ subroutine cat_enkf_increments(                               &
        
        N_select_varnames  = 0
        
-       if (any(obs_param%varname == 'Tb')) then
-          N_select_varnames = N_select_varnames + 1
-          select_varnames(N_select_varnames) = 'Tb'     
-       end if
-       
-       if (any(obs_param%varname == 'sfmc')) then
-          N_select_varnames = N_select_varnames + 1
-          select_varnames(N_select_varnames) = 'sfmc'     
-       end if
+       do ii = 1,N_obs_param
+       
+         if (trim(obs_param(ii)%varname) == 'Tb') then
+            N_select_varnames = N_select_varnames + 1
+            select_varnames(N_select_varnames) = 'Tb'     
+         end if
+         
+         if (trim(obs_param(ii)%varname) == 'sfmc') then
+            N_select_varnames = N_select_varnames + 1
+            select_varnames(N_select_varnames) = 'sfmc'     
+         end if
+
+         if (trim(obs_param(ii)%varname) == 'sfds') then
+            N_select_varnames = N_select_varnames + 1
+            select_varnames(N_select_varnames) = 'sfds'     
+         end if
 
-       if (any(obs_param%varname == 'sfds')) then
-          N_select_varnames = N_select_varnames + 1
-          select_varnames(N_select_varnames) = 'sfds'     
-       end if
+       end do
        
        ! Will get all species associated with Tb or sfds observations