diff --git a/ChangeLog b/ChangeLog
index e5f6dcf128..770da47536 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan 21 11:59:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_each_char): move forward.  [ruby-dev:33231]
+
 Mon Jan 21 06:40:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* transcode.c (transcode_dispatch): constified return value.
diff --git a/string.c b/string.c
index f95d2e8915..4d3d83792e 100644
--- a/string.c
+++ b/string.c
@@ -3233,7 +3233,7 @@ rb_str_inspect(VALUE str)
 	    char *s;
             char *q;
 
-escape_codepoint:
+	  escape_codepoint:
             for (q = p-n; q < p; q++) {
                 s = buf;
                 sprintf(buf, "\\x%02X", *q & 0377);
@@ -4605,7 +4605,7 @@ rb_str_each_char(VALUE str)
 	len = RSTRING_LEN(str);
 	if ((i += n) >= len) break;
 	enc = rb_enc_get(str);
-	s = rb_enc_left_char_head(ptr, ptr + i, enc);
+	s = rb_enc_right_char_head(ptr, ptr + i, enc);
 	n = rb_enc_mbclen(s, ptr + len, enc);
     }
     return str;