diff --git a/backend/composite.c b/backend/composite.c
index a8e328ed..6246e084 100644
--- a/backend/composite.c
+++ b/backend/composite.c
@@ -1435,7 +1435,7 @@ int cc_binary_string(struct zint_symbol *symbol, unsigned char source[], char bi
 		codewords_used += ecc_codewords;
 		codewords_used += 3;
 		
-		if(codewords_used > PDF_MAX) {
+		if(codewords_used > symbol->option_3) {
 			return ERROR_TOO_LONG;
 		}
 		/* *(cc_width) = 0.5 + sqrt((codewords_used) / 3); */
@@ -1608,7 +1608,7 @@ int cc_binary_string(struct zint_symbol *symbol, unsigned char source[], char bi
 		codewords_used += ecc_codewords;
 		codewords_used += 3;
 		
-		if(codewords_used > PDF_MAX) {
+		if(codewords_used > symbol->option_3) {
 			return ERROR_TOO_LONG;
 		}
 		/* *(cc_width) = 0.5 + sqrt((codewords_used) / 3); */
diff --git a/backend/pdf417.c b/backend/pdf417.c
index 2379058f..6d25239d 100644
--- a/backend/pdf417.c
+++ b/backend/pdf417.c
@@ -545,7 +545,7 @@ int pdf417(struct zint_symbol *symbol, unsigned char chaine[])
 	only 2 check digits, so I have abandoned it! - Zint now insists on a proportional
 	amount of check data unless overruled by the user */
 	
-	if(longueur + k > PDF_MAX) {
+	if(longueur + k > symbol->option_3) {
 		return 2;
 	}
 	if(((longueur + k) / symbol->option_2) > 90) {
diff --git a/backend/pdf417.h b/backend/pdf417.h
index def9ccce..8d2b4df9 100644
--- a/backend/pdf417.h
+++ b/backend/pdf417.h
@@ -28,7 +28,6 @@
 #define TEX 900
 #define BYT 901
 #define NUM 902
-#define PDF_MAX 928
 
 #define BRSET "ABCDEFabcdefghijklmnopqrstuvwxyz*+-"