diff --git a/ChangeLog b/ChangeLog
index 56f53ec9f0..e78c50ceb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 24 00:24:13 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_each): check #succ only when it is really
+	  needed.  small performance improvement.
+
 Tue Feb 24 00:19:33 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/pathname.rb (Pathname#foreachline): removed wrongly
diff --git a/range.c b/range.c
index 6e0af8679e..02a75e7009 100644
--- a/range.c
+++ b/range.c
@@ -417,10 +417,6 @@ range_each(VALUE range)
     beg = RANGE_BEG(range);
     end = RANGE_END(range);
 
-    if (!rb_respond_to(beg, id_succ)) {
-	rb_raise(rb_eTypeError, "can't iterate from %s",
-		 rb_obj_classname(beg));
-    }
     if (FIXNUM_P(beg) && FIXNUM_P(end)) { /* fixnums are special */
 	long lim = FIX2LONG(end);
 	long i;
@@ -439,6 +435,10 @@ range_each(VALUE range)
 	rb_block_call(beg, rb_intern("upto"), 2, args, rb_yield, 0);
     }
     else {
+	if (!rb_respond_to(beg, id_succ)) {
+	    rb_raise(rb_eTypeError, "can't iterate from %s",
+		     rb_obj_classname(beg));
+	}
 	range_each_func(range, each_i, NULL);
     }
     return range;