diff --git a/src/apps/debugger/source_language/CLanguageFamily.cpp b/src/apps/debugger/source_language/CLanguageFamily.cpp
index 592cf53009..142ecc6cd5 100644
--- a/src/apps/debugger/source_language/CLanguageFamily.cpp
+++ b/src/apps/debugger/source_language/CLanguageFamily.cpp
@@ -50,11 +50,10 @@ CLanguageFamily::ParseTypeExpression(const BString& expression,
 		modifierIndex = parsedName.FindFirst('&');
 	if (modifierIndex == -1)
 		modifierIndex = parsedName.FindFirst('[');
+	if (modifierIndex == -1)
+		modifierIndex = parsedName.Length();
 
-	if (modifierIndex >= 0)
-		parsedName.MoveInto(baseTypeName, 0, modifierIndex);
-	else
-		baseTypeName = parsedName;
+	parsedName.MoveInto(baseTypeName, 0, modifierIndex);
 
 	modifierIndex = parsedName.FindFirst('[');
 	if (modifierIndex >= 0) {