diff --git a/src_main/core/pichar.cpp b/src_main/core/pichar.cpp
index 9a416914..edb2dc70 100644
--- a/src_main/core/pichar.cpp
+++ b/src_main/core/pichar.cpp
@@ -95,7 +95,7 @@ int charCompare(const ushort * f, const ushort * s) {
 #  ifdef WINDOWS
 			CompareStringW(LOCALE_USER_DEFAULT, 0, (PCNZWCH)f, 1, (PCNZWCH)s, 1);
 #  else
-			strcmp((const char *)f, (const char *)s);
+			wcsncmp((const wchar_t *)f, (const wchar_t *)s, 1);
 #  endif
 #endif
 }
@@ -277,7 +277,7 @@ PIChar PIChar::toUpper() const {
 		return PIChar(wc);
 #  endif
 #endif
-	return PIChar(toupper(ch));
+	return PIChar(towupper(ch));
 }
 
 
@@ -295,7 +295,7 @@ PIChar PIChar::toLower() const {
 		return PIChar(wc);
 #  endif
 #endif
-	return PIChar(tolower(ch));
+	return PIChar(towlower(ch));
 }