diff --git a/src/anonymousUserTracking/complexCriteria.test.ts b/src/anonymousUserTracking/complexCriteria.test.ts
index df29440c..7aba642f 100644
--- a/src/anonymousUserTracking/complexCriteria.test.ts
+++ b/src/anonymousUserTracking/complexCriteria.test.ts
@@ -694,9 +694,7 @@ describe('complexCriteria', () => {
           {
             eventName: 'button-clicked',
             dataFields: {
-              'button-clicked': {
-                lastPageViewed: 'welcome page'
-              }
+              lastPageViewed: 'welcome page'
             },
             eventType: 'customEvent'
           },
diff --git a/src/anonymousUserTracking/criteriaCompletionChecker.ts b/src/anonymousUserTracking/criteriaCompletionChecker.ts
index 089dad52..fbd3103d 100644
--- a/src/anonymousUserTracking/criteriaCompletionChecker.ts
+++ b/src/anonymousUserTracking/criteriaCompletionChecker.ts
@@ -372,7 +372,10 @@ class CriteriaCompletionChecker {
   }
 
   private getFieldValue(data: any, field: string): any {
-    const fields = field.split('.');
+    let fields = field.split('.');
+    if (data?.eventType === TRACK_EVENT && data?.eventName === fields[0]) {
+      fields = [fields[fields.length - 1]];
+    }
     return fields.reduce(
       (value, currentField) =>
         value && value[currentField] !== undefined
diff --git a/src/anonymousUserTracking/tests/complexCriteria.test.ts b/src/anonymousUserTracking/tests/complexCriteria.test.ts
index c58280bc..03b4de27 100644
--- a/src/anonymousUserTracking/tests/complexCriteria.test.ts
+++ b/src/anonymousUserTracking/tests/complexCriteria.test.ts
@@ -694,7 +694,7 @@ describe('complexCriteria', () => {
           {
             eventName: 'button-clicked',
             dataFields: {
-              'button-clicked': { lastPageViewed: 'welcome page' }
+              lastPageViewed: 'welcome page'
             },
             eventType: 'customEvent'
           },