diff --git a/sp/src/game/shared/mapbase/vscript_singletons.cpp b/sp/src/game/shared/mapbase/vscript_singletons.cpp
index dc3092f1..4b1a8344 100644
--- a/sp/src/game/shared/mapbase/vscript_singletons.cpp
+++ b/sp/src/game/shared/mapbase/vscript_singletons.cpp
@@ -2290,9 +2290,18 @@ public:
 		{
 			if ( val.m_type == FIELD_CSTRING )
 			{
-				CUtlString s = val.m_pszString;
-				//s.SetLength( COMMAND_COMPLETION_ITEM_LENGTH - 1 );
-				commands.AddToTail( s );
+				CUtlString &s = commands.Element( commands.AddToTail() );
+				int len = V_strlen( val.m_pszString );
+
+				if ( len <= COMMAND_COMPLETION_ITEM_LENGTH - 1 )
+				{
+					s.Set( val.m_pszString );
+				}
+				else
+				{
+					s.SetDirect( val.m_pszString, COMMAND_COMPLETION_ITEM_LENGTH - 1 );
+				}
+
 				++count;
 			}
 			g_pScriptVM->ReleaseValue(val);