diff --git a/gpt_entity/gpt_entity.inc b/gpt_entity/gpt_entity.inc
index dccfd22..8a2050e 100644
--- a/gpt_entity/gpt_entity.inc
+++ b/gpt_entity/gpt_entity.inc
@@ -58,7 +58,8 @@ function gpt_entity_form($entity_type, $entity, &$form, &$form_state, $langcode)
   }
 
   // TODO: Remove gpt_entity_form_alter() if http://drupal.org/node/1284642 is
-  // fixed in core and uncomment the line below.
+  // fixed in core and uncomment the lines below.
+  //$form['#submit'][] = 'subform_submit_all';
   //$form['#submit'][] = 'gpt_entity_form_submit';
 }
 
diff --git a/gpt_entity/gpt_entity.module b/gpt_entity/gpt_entity.module
index ef2fb69..f914189 100644
--- a/gpt_entity/gpt_entity.module
+++ b/gpt_entity/gpt_entity.module
@@ -128,6 +128,7 @@ function gpt_entity_form_alter(&$form) {
   // TODO: Remove gpt_entity_form_alter() if http://drupal.org/node/1284642 is
   // fixed in core.
   if (isset($form['gpt_entity'])) {
+    $form['#submit'][] = 'subform_submit_all';
     $form['#submit'][] = 'gpt_entity_form_submit';
   }
 }