diff --git a/base/CUnicode.cpp b/base/CUnicode.cpp
index 5a677874..f36a82d7 100644
--- a/base/CUnicode.cpp
+++ b/base/CUnicode.cpp
@@ -244,11 +244,11 @@ CUnicode::UTF8ToText(const CString& src, bool* errors)
 			*dst++ = '?';
 		}
 		else {
-			dst += len;
+			dst   += mblen;
 		}
 	}
-	*dst = '\0';
-	CString text(mbs);
+	*dst++ = '\0';
+	CString text(mbs, dst - mbs);
 
 	// clean up
 	delete[] mbs;