1 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 923fbd8522..b06b618d5a 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -148,15 +148,14 @@ module ActiveRecord
         end
 
       private
-        def create_record(attributes)
+        def create_record(attributes, &block)
           # Can't use Base.create because the foreign key may be a protected attribute.
           ensure_owner_is_not_new
           if attributes.is_a?(Array)
             attributes.collect { |attr| create(attr) }
           else
-            record = build(attributes)
-            yield(record)
-            record
+            load_target
+            build_record(attributes, &block)
           end
         end
     end