diff --git a/CHANGES b/CHANGES
index 37f9236f..137572b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
   * Manage data structure nesting depth in state object during generation. This
     should reduce problems with to_json method definіtions that only have one
     argument.
+  * Some fixes in the state objects and additional tests.
 2010-08-06 (1.4.4)
   * Fixes build problem for rubinius under OS X, http://github.com/flori/json/issues/closed#issue/25
   * Fixes crashes described in http://github.com/flori/json/issues/closed#issue/21 and
diff --git a/lib/json/common.rb b/lib/json/common.rb
index c6a31c14..b5306703 100644
--- a/lib/json/common.rb
+++ b/lib/json/common.rb
@@ -63,20 +63,20 @@ def generator=(generator) # :nodoc:
       end
       self.state = generator::State
       const_set :State, self.state
-      const_set :SAFE_STATE_PROTOTYPE, State.new.freeze
+      const_set :SAFE_STATE_PROTOTYPE, State.new
       const_set :FAST_STATE_PROTOTYPE, State.new(
         :indent         => '',
         :space          => '',
         :object_nl      => "",
         :array_nl       => "",
         :max_nesting    => false
-      ).freeze
+      )
       const_set :PRETTY_STATE_PROTOTYPE, State.new(
         :indent         => '  ',
         :space          => ' ',
         :object_nl      => "\n",
         :array_nl       => "\n"
-      ).freeze
+      )
     end
 
     # Returns the JSON generator modul, that is used by JSON. This might be