diff --git a/src/map/ENC/iso8211.cpp b/src/map/ENC/iso8211.cpp
index e922c6ae..b97ca3f7 100644
--- a/src/map/ENC/iso8211.cpp
+++ b/src/map/ENC/iso8211.cpp
@@ -194,6 +194,9 @@ bool ISO8211::readDDA(const FieldDefinition &def, SubFields &fields)
 				tag++;
 			}
 		}
+
+		if (tag != tags.size())
+			return false;
 	}
 
 	fields = SubFields(defTags, defs, repeat);