diff --git a/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java b/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java
index 2acaa296..ddcbbc36 100644
--- a/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java
+++ b/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java
@@ -240,8 +240,8 @@ public class NaturalLanguage extends Language implements Comparable<NaturalLangu
 
 	@Override
 	public int compareTo(NaturalLanguage other) {
-		String key = getName().equals("Suomi") ? "su" : getLocale().toString();
-		String otherKey = other.getName().equals("Suomi") ? "su" : other.getLocale().toString();
+		String key = getLocale().getCountry().equals("FI") ? "su" : getLocale().toString();
+		String otherKey = other.getLocale().getCountry().equals("FI") ? "su" : other.getLocale().toString();
 		return key.compareTo(otherKey);
 	}
 }
diff --git a/app/src/main/java/io/github/sspanak/tt9/util/Text.java b/app/src/main/java/io/github/sspanak/tt9/util/Text.java
index 70d14fc2..b18bf945 100644
--- a/app/src/main/java/io/github/sspanak/tt9/util/Text.java
+++ b/app/src/main/java/io/github/sspanak/tt9/util/Text.java
@@ -25,11 +25,9 @@ public class Text extends TextTools {
 			return text;
 		}
 
-		if (text.length() == 1) {
-			return text.toUpperCase(language.getLocale());
-		} else {
-			return text.substring(0, 1).toUpperCase(language.getLocale()) + text.substring(1);
-		}
+		char[] chars = text.toCharArray();
+		chars[0] = Character.toUpperCase(chars[0]);
+		return String.valueOf(chars);
 	}