diff --git a/SPID/include/FormData.h b/SPID/include/FormData.h
index f379c1c..4be336c 100644
--- a/SPID/include/FormData.h
+++ b/SPID/include/FormData.h
@@ -353,7 +353,7 @@ namespace Forms
 				}
 			}
 
-			return (options & kRequireAll) == 0 || a_formVec.size() == a_rawFormVec.size();
+			return ((options & kRequireAll) == 0 && !a_formVec.empty()) || a_formVec.size() == a_rawFormVec.size();
 		}
 	}