diff --git a/source.elna b/source.elna
index c4fa23c..9225a26 100644
--- a/source.elna
+++ b/source.elna
@@ -351,22 +351,26 @@ end
 proc lex_comment(source_code: ^SourceCode, token_content: ^String) -> Bool;
 var
   content_length: Word
+  trailing: Word
 begin
   content_length := 0u
   token_content^ := source_code^.text
+  trailing := 0u
 
-  while source_code^.text.length > 1u do
-    if source_code^.text[1u] = '*' and source_code^.text[2u] = ')' then
-	  source_code^ := advance_source(source_code^, 2u)
-	  token_content^ := substring(token_content^, 0u, content_length)
-
-	  return true
+  while source_code^.text.length > 0u and trailing < 2u do
+    if source_code^.text[1u] = '*' then
+	  content_length := content_length + trailing
+	  trailing := 1u
+	elsif source_code^.text[1u] = ')' and trailing = 1u then
+	  trailing := 2u
+	else
+      content_length := content_length + trailing + 1u
+	  trailing := 0u
 	end
-    content_length := content_length + 1u
-	source_code^ := advance_source(source_code^, 1u)
+    source_code^ := advance_source(source_code^, 1u)
   end
 
-  return false
+  return trailing = 2u
 end
 
 proc lex_character(input: ^Char, current_token: ^Token) -> ^Char;