diff --git a/src/apps/mavlinkgen/generator/MAVLinkXMLParser.cc b/src/apps/mavlinkgen/generator/MAVLinkXMLParser.cc
index da23a1f60e22d00c4b9a45bb96a83fc998d74cef..34cc9ec9bc067a77e76d3099a8e3ba57e0e8fff5 100644
--- a/src/apps/mavlinkgen/generator/MAVLinkXMLParser.cc
+++ b/src/apps/mavlinkgen/generator/MAVLinkXMLParser.cc
@@ -276,8 +276,8 @@ bool MAVLinkXMLParser::generate()
                                                         else if (pp2.isElement())
                                                         {
                                                             fieldComment += pp2.text() + sep;
-                                                            pp = pp.nextSibling();
                                                         }
+                                                        pp = pp.nextSibling();
                                                     }
                                                     fieldComment = fieldComment.replace("\n", " ");
                                                     fieldComment = " /* " + fieldComment.simplified() + " */";