diff --git a/ChangeLog b/ChangeLog
index ce0400506c..79fb443498 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug 23 13:19:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_norm_arg): check also nested arguments.  [ruby-dev:31502]
+
 Thu Aug 23 00:06:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* util.c: updated for ANSI C only.  applied a patch from
diff --git a/parse.y b/parse.y
index 583bc45bdd..857c411d1f 100644
--- a/parse.y
+++ b/parse.y
@@ -4154,6 +4154,7 @@ f_norm_arg	: tCONSTANT
 		    }
 		| tIDENTIFIER
 		    {
+			shadowing_lvar($1);
 			$$ = $1;
 		    }
 		;
@@ -4163,7 +4164,6 @@ f_arg_item	: f_norm_arg
 		    /*%%%*/
 			if (!is_local_id($1))
 			    yyerror("formal argument must be local variable");
-			shadowing_lvar($1);
 			arg_var($1);
 			$$ = NEW_ARGS_AUX($1, 1);
 		    /*%