1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/serialization.rb b/activerecord/lib/active_record/attribute_methods/serialization.rb
index b084fdc25b..d1eb3d5bfc 100644
--- a/activerecord/lib/active_record/attribute_methods/serialization.rb
+++ b/activerecord/lib/active_record/attribute_methods/serialization.rb
@@ -80,15 +80,15 @@ module ActiveRecord
         end
       end
 
-      def type_cast_attribute(column)
-        if self.class.serialized_attributes.include?(column.name)
-          @attributes[column.name].unserialized_value
+      def type_cast_attribute(column, value)
+        if column && self.class.serialized_attributes[column.name]
+          value.unserialized_value
         else
           super
         end
       end
 
-      def type_cast_attribute_for_write(column, attr_name, value)
+      def type_cast_attribute_for_write(column, value)
         if column && coder = self.class.serialized_attributes[column.name]
           Attribute.new(coder, value, :unserialized)
         else