diff --git a/app/models/has_vcards/concerns/has_vcards.rb b/app/models/has_vcards/concerns/has_vcards.rb
index <HASH>..<HASH> 100644
--- a/app/models/has_vcards/concerns/has_vcards.rb
+++ b/app/models/has_vcards/concerns/has_vcards.rb
@@ -27,7 +27,8 @@ module HasVcards
         def vcard_with_autobuild
           vcard_without_autobuild || build_vcard
         end
-        alias_method_chain :vcard, :autobuild
+        alias_method :vcard_without_autobuild, :vcard
+        alias_method :vcard, :vcard_with_autobuild
 
         # Access restrictions
         if defined?(ActiveModel::MassAssignmentSecurity)
diff --git a/app/models/has_vcards/vcard.rb b/app/models/has_vcards/vcard.rb
index <HASH>..<HASH> 100644
--- a/app/models/has_vcards/vcard.rb
+++ b/app/models/has_vcards/vcard.rb
@@ -28,7 +28,9 @@ module HasVcards
     def address_with_autobuild
       address_without_autobuild || build_address
     end
-    alias_method_chain :address, :autobuild
+    alias_method :address_without_autobuild, :address
+    alias_method :address, :address_with_autobuild
+
 
     # Contacts
     has_many :contacts, class_name: 'PhoneNumber', inverse_of: :vcard do
fix: alias_method_chain is deprecated, replaced with alias_method