diff --git a/ChangeLog b/ChangeLog
index 1063b9fbeb..423302fcf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 26 19:27:11 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* insnhelper.ci (vm_throw): fix to move increment point.
+	  [ruby-dev:31840]
+
 Wed Sep 26 19:23:56 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* cont.c: Fiber as SemiCoroutine on default. [ruby-core:12146]
diff --git a/insnhelper.ci b/insnhelper.ci
index 7ab7456995..4be9c7259e 100644
--- a/insnhelper.ci
+++ b/insnhelper.ci
@@ -1286,12 +1286,12 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_num_t throw_state, VAL
 			    break;
 			}
 		    }
-		    cfp++;
 		    if (GET_LFP() == cfp->lfp &&
 			cfp->iseq->type == ISEQ_TYPE_METHOD) {
 			is_orphan = 0;
 			break;
 		    }
+		    cfp++;
 		}
 
 		if (is_orphan) {