diff --git a/src/ZNCString.cpp b/src/ZNCString.cpp
index 5b4e3862..a8c5affe 100644
--- a/src/ZNCString.cpp
+++ b/src/ZNCString.cpp
@@ -144,25 +144,13 @@ CString& CString::MakeLower() {
 
 CString CString::AsUpper() const {
 	CString sRet = *this;
-
-	for (size_type a = 0; a < length(); a++) {
-		char& c = sRet[a];
-		//TODO use unicode
-		c = (char)toupper(c);
-	}
-
+	sRet.MakeUpper();
 	return sRet;
 }
 
 CString CString::AsLower() const {
 	CString sRet = *this;
-
-	for (size_type a = 0; a < length(); a++) {
-		char& c = sRet[a];
-		//TODO use unicode
-		c = (char)tolower(c);
-	}
-
+	sRet.MakeLower();
 	return sRet;
 }