diff --git a/Tools/px4airframes/srcparser.py b/Tools/px4airframes/srcparser.py
index 7b6def6834..130b0f24cf 100644
--- a/Tools/px4airframes/srcparser.py
+++ b/Tools/px4airframes/srcparser.py
@@ -241,9 +241,9 @@ class SourceParser(object):
         for tag in tags:
             if tag == "maintainer":
                 maintainer = tags[tag]
-            if tag == "type":
+            elif tag == "type":
                 airframe_type = tags[tag]
-            if tag == "name":
+            elif tag == "name":
                 airframe_name = tags[tag]
             elif tag not in self.valid_tags:
                 sys.stderr.write("Aborting due to invalid documentation tag: '%s'\n" % tag)