diff --git a/extern/oics/tinyxmlparser.cpp b/extern/oics/tinyxmlparser.cpp
index c29e263f49..241f85c3ae 100644
--- a/extern/oics/tinyxmlparser.cpp
+++ b/extern/oics/tinyxmlparser.cpp
@@ -104,25 +104,17 @@ void TiXmlBase::ConvertUTF32ToUTF8( unsigned long input, char* output, int* leng
 
 	output += *length;
 
-	// Scary scary fall throughs.
-	switch (*length)
-	{
-		case 4:
-			--output;
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK);
-			input >>= 6;
-		case 3:
-			--output;
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK);
-			input >>= 6;
-		case 2:
-			--output;
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK);
-			input >>= 6;
-		case 1:
-			--output;
-			*output = (char)(input | FIRST_BYTE_MARK[*length]);
-	}
+    int lengthLeft = *length;
+    while (lengthLeft > 1)
+    {
+        --output;
+        *output = (char)((input | BYTE_MARK) & BYTE_MASK);
+        input >>= 6;
+        --lengthLeft;
+    }
+
+    --output;
+    *output = (char)(input | FIRST_BYTE_MARK[*length]);
 }