diff --git a/R/aFIPC.R b/R/aFIPC.R
index 62546519..c8bdc58a 100644
--- a/R/aFIPC.R
+++ b/R/aFIPC.R
@@ -770,8 +770,8 @@ autoFIPC <-
       if (
         !is.na(newFormItemName) &&
         !is.na(oldFormItemName) &&
-          (length(stats::na.omit(unique(newFormModel@Data$data[, newFormItemName]))) ==
-            length(stats::na.omit(unique(oldFormModel@Data$data[, oldFormItemName]))))
+          (sum(!is.na(unique(newFormModel@Data$data[, newFormItemName]))) ==
+            sum(!is.na(unique(oldFormModel@Data$data[, oldFormItemName]))))
       ) {
         message(
           'applying ',
diff --git a/R/surveyFA.R b/R/surveyFA.R
index f60fffd8..787c1cc9 100644
--- a/R/surveyFA.R
+++ b/R/surveyFA.R
@@ -83,7 +83,7 @@ surveyFA <- function(
   response_data <- as.data.frame(data)
   response_data <-
     response_data[, vapply(response_data, function(column) {
-      nunique <- length(unique(stats::na.omit(column)))
+      nunique <- sum(!is.na(unique(column)))
       nunique >= 2L
     }, logical(1L))]