diff --git a/ChangeLog b/ChangeLog
index 5e79eb0dd6..306fabbe36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 17 00:12:41 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: (bug fix) instance variable @frame was used
+	  without initializing on TkComposite module 
+
 Thu Oct 16 23:51:04 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: If $DEBUG == true and some exception is caused
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 0394611172..18f398f2aa 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -5664,16 +5664,17 @@ module TkComposite
 
   def initialize(parent=nil, *args)
     @delegates = {} 
-    @delegates['DEFAULT'] = @frame
 
     if parent.kind_of? Hash
       keys = _symbolkey2str(parent)
       parent = keys['parent']
       keys['parent'] = @frame = TkFrame.new(parent)
+      @delegates['DEFAULT'] = @frame
       @path = @epath = @frame.path
       initialize_composite(keys)
     else
       @frame = TkFrame.new(parent)
+      @delegates['DEFAULT'] = @frame
       @path = @epath = @frame.path
       initialize_composite(*args)
     end