diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 3f60282..79e5751 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -157,6 +157,7 @@ class MembersController < ApplicationController
   def member_data(member, fields_to_show)
     profile_data = []
     fields_to_show.each do |field| 
+      # debugger
       case field['type']
       when 'profile'
         field_data = member.get_attribute_data(field) rescue {}
@@ -166,7 +167,7 @@ class MembersController < ApplicationController
         field_data = member.attribute_values.find_by(:key=>field['key']).get_field_value rescue {}
       end
       next if field_data.blank? or field_data['value'].blank?
-
+      
       if field['sort_order']
         field_data['sort_value'] = field_data['val'].blank? ? field_data['value'] : field_data['val']
         field_data['sort_value'] = (field_data['sort_value'].is_i? ? field_data['sort_value'].to_i : field_data['sort_value']  rescue field_data['sort_value'])
diff --git a/app/models/attribute_field.rb b/app/models/attribute_field.rb
index 84af526..fba461a 100644
--- a/app/models/attribute_field.rb
+++ b/app/models/attribute_field.rb
@@ -101,8 +101,16 @@ class AttributeField
     if field_status.eql?(true)
       @attribute_field_counter = role.attribute_fields.count rescue nil
       @attribute_field = self.find(attribute_field_id) rescue nil
+      old_key = @attribute_field.key
       @attribute_field.update(role_param)
       @attribute_field.save
+      attribute_values = @attribute_field.attribute_values
+      if attribute_values.count > 0
+        attribute_values.each do |av|
+          av.key = role_param["key"]
+          av.save
+        end
+      end
       @attribute_field[:af_count] = @attribute_field_counter
     else
       @attribute_field_counter = role.attribute_fields.count rescue nil
diff --git a/app/models/attribute_value.rb b/app/models/attribute_value.rb
index 0cb6e61..5bb74b5 100644
--- a/app/models/attribute_value.rb
+++ b/app/models/attribute_value.rb
@@ -199,7 +199,7 @@ def unset_all_lang_values
   end #of data_proc
 
   def check_key
-    self.key = attribute_field.key
+    self.key = self.attribute_field.key
   end
 
   def method_missing(*field)