diff --git a/src/cindent.c b/src/cindent.c
index cf18441..2414b3f 100644
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -405,7 +405,12 @@
 	return FALSE;
 
     while (vim_isIDc(**s))
-	(*s)++;
+    {
+        if (has_mbyte)
+            (*s) += (*mb_ptr2len)(*s);
+        else
+            (*s)++;
+    }
 
     *s = cin_skipcomment(*s);