diff --git a/ChangeLog b/ChangeLog
index dd3c1f767a..07b188317b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct 17 16:34:27 2009  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y (parser_yylex): fix token even after trailing under score.
+
 Sat Oct 17 11:27:44 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* vm_method.c (basic_obj_respond_to): call #respond_to_missing?
diff --git a/parse.y b/parse.y
index ceaeed29a4..507ff06a4a 100644
--- a/parse.y
+++ b/parse.y
@@ -7062,13 +7062,13 @@ parser_yylex(struct parser_params *parser)
 
 	  decode_num:
 	    pushback(c);
-	    tokfix();
 	    if (nondigit) {
 		char tmp[30];
 	      trailing_uc:
 		snprintf(tmp, sizeof(tmp), "trailing `%c' in number", nondigit);
 		yyerror(tmp);
 	    }
+	    tokfix();
 	    if (is_float) {
 		double d = strtod(tok(), 0);
 		if (errno == ERANGE) {