diff --git a/src/asm/charmap.c b/src/asm/charmap.c
index 4d7214a9..95a592a9 100644
--- a/src/asm/charmap.c
+++ b/src/asm/charmap.c
@@ -32,12 +32,10 @@ int32_t readUTF8Char(char *dest, char *src)
 
 		dest[i] = src[i];
 
-		i++;
 		if (state == 0) {
-			dest[i] = '\0';
+			dest[++i] = '\0';
 			return i;
 		}
-		dest[i] = src[i];
 	}
 }