diff --git a/flow_action_components/CollectionProcessors/force-app/main/default/classes/CountRecordsAndFields.cls b/flow_action_components/CollectionProcessors/force-app/main/default/classes/CountRecordsAndFields.cls
index 9bc040090..c22b9c0a5 100755
--- a/flow_action_components/CollectionProcessors/force-app/main/default/classes/CountRecordsAndFields.cls
+++ b/flow_action_components/CollectionProcessors/force-app/main/default/classes/CountRecordsAndFields.cls
@@ -12,13 +12,15 @@ global with sharing class CountRecordsAndFields {
             try {
                 for (SObject record : records) {
                     if (!String.isBlank(fieldName) && !String.isBlank(fieldValue)) {
-                        if (record.get(fieldName) == fieldValue) {
+                        Object recValue = record.get(fieldName);
+                        if (recValue != null &&
+                        String.valueOf(recValue).equalsIgnoreCase(fieldValue)) {
                             response.matchedNumber++;
                         }
                     }
-    
                     response.totalNumber++;
                 }
+
             } catch (Exception ex) {
                 response.errors = ex.getMessage();
             }
@@ -54,4 +56,4 @@ global with sharing class CountRecordsAndFields {
         @InvocableVariable
         global String errors;
     }
-}
\ No newline at end of file
+}