diff --git a/editablefields.module b/editablefields.module
index ddfe664..c0bfea7 100755
--- a/editablefields.module
+++ b/editablefields.module
@@ -268,6 +268,7 @@ function editablefields_field_formatter_view($entity_type, $entity, $field, $ins
     return array(
       0 => drupal_get_form('editablefields_form__' . $entity_type . '__' . $id . '__' . $vid . '__' . $field['field_name'], $entity_type, $entity, $field, $instance, $langcode, $display),
     );
+  
   }
 }
 
@@ -302,6 +303,8 @@ function editablefields_form($form, &$form_state, $entity_type, $entity, $field,
   $form['#entity_type'] = $entity_type;
   $form['#bundle'] = $bundle;
   $form['#langcode'] = $langcode;
+  
+  $form['field_name'] = array('#value'=>$field['field_name']);
 
   list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
   $form['#entity_id'] = $id;
@@ -387,7 +390,7 @@ function editablefields_form($form, &$form_state, $entity_type, $entity, $field,
       ),
     );
   }
-
+  
   return $form;
 }
 
@@ -523,8 +526,21 @@ function editablefields_form_submit(&$form, &$form_state) {
 
   entity_form_submit_build_entity($element['#entity_type'], $entity, $element, $form_state);
 
+  if(isset($form['field_name'])) {
+    $entity_info = entity_get_info($element['#entity_type']);
+    
+    $new_entity = new stdClass();
+    $new_entity->{$entity_info['entity keys']['id']} = $element['#entity_id'];
+    $new_entity->type = $element['#bundle'];
+    $new_entity->bundle = $element['#entity_type'];
+    $new_entity->{$form['field_name']['#value']} = $entity->{$form['field_name']['#value']};
+  
+    field_attach_presave($element['#entity_type'], $new_entity);
+    field_attach_update($element['#entity_type'], $new_entity);
+    cache_clear_all($element['#entity_id'], 'cache_entity_' . $element['#entity_type']);
+  }
   // TODO: needs a try / catch.
-  entity_save($element['#entity_type'], $entity);
+  
   $form_state['rebuild'] = TRUE;
 
   // Re-load the entity so that fields can act on the new value.
@@ -574,4 +590,4 @@ function _editablefields_set_edit_mode(&$form_state, $value, $parents = array())
   else {
     $form_state['edit_mode'] = $value;
   }
-}
+}
\ No newline at end of file