diff --git a/lib/pdf-lib-utils.ts b/lib/pdf-lib-utils.ts
index 06b4e58a..25eb1454 100644
--- a/lib/pdf-lib-utils.ts
+++ b/lib/pdf-lib-utils.ts
@@ -39,6 +39,8 @@ export const fillAllFieldsFromPDFFormWithPath = (pdfForm) => {
     if (field.constructor.name === 'PDFTextField') {
       const maxLength = field.getMaxLength();
       field.setText(truncateMiddle(field.getName(), maxLength));
+    } else if (field.constructor.name === 'PDFCheckBox') {
+      console.debug(`Found checkbox: ${field.getName()}`);
     }
   }
 };
diff --git a/lib/tax-forms/w8-ben-e.ts b/lib/tax-forms/w8-ben-e.ts
index 74866d75..0be42808 100644
--- a/lib/tax-forms/w8-ben-e.ts
+++ b/lib/tax-forms/w8-ben-e.ts
@@ -13,6 +13,14 @@ const W8BenEFieldsDefinition: Partial<Record<keyof W8BenETaxFormValues, PDFField
     formPath: 'topmostSubform[0].Page1[0].f1_2[0]',
     transform: getCountryName,
   },
+  nffeStatus: {
+    type: 'combo',
+    values: {
+      ActiveNFFE: 'topmostSubform[0].Page1[0].Col2[0].c1_3[13]',
+      PassiveNFFE: 'topmostSubform[0].Page1[0].Col2[0].c1_3[14]',
+      NonProfitOrganization: 'topmostSubform[0].Page1[0].Col2[0].c1_3[10]',
+    },
+  },
   chapter3Status: {
     type: 'combo',
     values: {