diff --git a/rostsd_gen/index.js b/rostsd_gen/index.js
index 5521dd72..bf241bb7 100644
--- a/rostsd_gen/index.js
+++ b/rostsd_gen/index.js
@@ -65,7 +65,7 @@ function getPkgInfos(generatedRoot) {
     for (let filename of files) {
       const typeClass = fileName2Typeclass(filename);
 
-      if (typeClass.type === 'srv') {
+      if (typeClass.type && typeClass.type.startsWith('srv')) {
         // skip __srv__<action>
         if (
           !typeClass.name.endsWith('_Request') &&
@@ -90,7 +90,7 @@ function getPkgInfos(generatedRoot) {
         def: def,
       };
 
-      if (typeClass.type === 'action') {
+      if (typeClass.type && typeClass.type.startsWith('action')) {
         pkgInfo.actions.push(msgInfo);
       } else {
         pkgInfo.messages.push(msgInfo);