1 files changed, 6 insertions, 1 deletions
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index e7b8ed4609..17efcdc8d3 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -168,7 +168,7 @@ class OpenStruct
   #
   def new_ostruct_member(name)
     name = name.to_sym
-    unless respond_to?(name)
+    unless singleton_class.method_defined?(name)
       define_singleton_method(name) { @table[name] }
       define_singleton_method("#{name}=") { |x| modifiable[name] = x }
     end
@@ -176,6 +176,11 @@ class OpenStruct
   end
   protected :new_ostruct_member
 
+  def freeze
+    @table.each_key {|key| new_ostruct_member(key)}
+    super
+  end
+
   def respond_to_missing?(mid, include_private = false)
     mname = mid.to_s.chomp("=").to_sym
     @table.key?(mname) || super