diff --git a/src/shared/cplusplus/Lexer.cpp b/src/shared/cplusplus/Lexer.cpp
index 4d3437caf4702005eec42a341da0da4ee04ea194..ab3c35e67bea94c9251d745611962cbebb138345 100644
--- a/src/shared/cplusplus/Lexer.cpp
+++ b/src/shared/cplusplus/Lexer.cpp
@@ -428,8 +428,13 @@ void Lexer::scan_helper(Token *tok)
             bool doxy = false;
 
             if (_yychar == '*' || _yychar == '!') {
+                const char ch = _yychar;
+
                 yyinp();
 
+                if (ch == '*' && _yychar == '/')
+                    goto _Ldone;
+
                 if (! _yychar || std::isspace(_yychar))
                     doxy = true;
             }
@@ -444,6 +449,7 @@ void Lexer::scan_helper(Token *tok)
                 }
             }
 
+        _Ldone:
             if (_yychar)
                 yyinp();
             else