diff --git a/contributors.md b/contributors.md
index 70abd26f82..eec496cf28 100644
--- a/contributors.md
+++ b/contributors.md
@@ -58,6 +58,7 @@ Includes all git commit authors. Aliases are GitHub user names.
 * Hielke Morsink (Broxzier)
 * Lucas Riutzel (jackinloadup)
 * Youngjae Yu (YJSoft)
+* Chanwoong Kim (kexplo)
 
 ## Toolchain
 * (Balletie) - OSX
diff --git a/src/drawing/string.c b/src/drawing/string.c
index 174521a75c..77f49c1455 100644
--- a/src/drawing/string.c
+++ b/src/drawing/string.c
@@ -584,18 +584,14 @@ void draw_string_centred_raw(rct_drawpixelinfo *dpi, int x, int y, int numLines,
 		int width = gfx_get_string_width(text);
 		gfx_draw_string(dpi, text, 254, x - (width / 2), y);
 
-		char c;
-		while ((c = *text++) != 0) {
-			if (c >= 32) continue;
-			if (c <= 4) {
-				text++;
-				continue;
-			}
-			if (c <= 16) continue;
-			text += 2;
-			if (c <= 22) continue;
-			text += 2;
+		const utf8 *ch = text;
+		const utf8 *nextCh = 0;
+		int codepoint = 0;
+
+		while ((codepoint = utf8_get_next(ch, (const utf8**)&nextCh)) != 0) {
+			ch = nextCh;
 		}
+		text = ch+1;
 
 		y += font_get_line_height(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, uint16));
 	}