diff --git a/kernel/trunk/gui/char.mt b/kernel/trunk/gui/char.mt
index f932b60104..6d7aae7b93 100644
Binary files a/kernel/trunk/gui/char.mt and b/kernel/trunk/gui/char.mt differ
diff --git a/kernel/trunk/gui/font.inc b/kernel/trunk/gui/font.inc
index a4bdabb641..0bb5ac3912 100644
--- a/kernel/trunk/gui/font.inc
+++ b/kernel/trunk/gui/font.inc
@@ -130,6 +130,7 @@ deltaToScreen = 28
 .drawUTF8:
         dec     dword [esp]
         js      .done
+@@:
         xor     ebx, ebx
         mov     bl, [esi]
         inc     esi
@@ -137,6 +138,7 @@ deltaToScreen = 28
         jz      .done
         jns     .valid
         shl     bx, 10
+        jnc     @b
         shr     bh, 2
         mov     bl, [esi]
         shl     bl, 2