diff --git a/src/main/java/com/eprosima/fastdds/idl/grammar/Context.java b/src/main/java/com/eprosima/fastdds/idl/grammar/Context.java
index 6b8ba6b8..2945dd57 100644
--- a/src/main/java/com/eprosima/fastdds/idl/grammar/Context.java
+++ b/src/main/java/com/eprosima/fastdds/idl/grammar/Context.java
@@ -342,7 +342,7 @@ public ArrayList<Entry<String, TypeCode>> getTypeCodesToDefine()
     {
         ArrayList<Entry<String, TypeCode>> typecodes = new ArrayList<Entry<String, TypeCode>>();
 
-        for (TypeDeclaration type : m_types.values())
+        for (TypeDeclaration type : getTypes())
         {
             if (type.getTypeCode() instanceof MemberedTypeCode && !(type.getTypeCode() instanceof EnumTypeCode))
             {
diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser
index f1bc6cdd..97ed0b35 160000
--- a/thirdparty/idl-parser
+++ b/thirdparty/idl-parser
@@ -1 +1 @@
-Subproject commit f1bc6cdd0cc1d957fa336d358c6b198f570804ee
+Subproject commit 97ed0b3533abeff445c77ea9a976604fd25c8967