diff --git a/ChangeLog b/ChangeLog
index b0084231fc..1ba58dadc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 17 01:35:28 2004  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
+	  to NODE_LIT.  [ruby-dev:22920]
+
 Tue Feb 17 01:20:57 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb: new module FileUtils::DryRun.
diff --git a/eval.c b/eval.c
index 9d46524f0a..e4890de268 100644
--- a/eval.c
+++ b/eval.c
@@ -3643,6 +3643,9 @@ rb_eval(self, n)
 		nd_set_type(node, NODE_LIT);
 		node->nd_lit = result;
 		break;
+              case NODE_LIT:
+                /* other thread may replace NODE_DREGX_ONCE to NODE_LIT */
+		goto again;
 	      case NODE_DXSTR:
 		result = rb_funcall(self, '`', 1, str);
 		break;