diff --git a/includes/base.inc b/includes/base.inc
index 804ccc2..0fe65ea 100644
--- a/includes/base.inc
+++ b/includes/base.inc
@@ -311,7 +311,7 @@ class views_object {
         else if (!empty($definition[$key]['translatable']) && !empty($value)) {
           // Build source data and add to the array
           $format = NULL;
-          if (isset($definition['format_key']) && isset($options[$definition['format_key']])) {
+          if (isset($definition['format_key']) && isset($storage[$definition['format_key']])) {
             $format = $options[$definition['format_key']];
           }
           $translatable[] = array(
diff --git a/tests/views_translatable.test b/tests/views_translatable.test
index f316ecd..9ad58db 100644
--- a/tests/views_translatable.test
+++ b/tests/views_translatable.test
@@ -114,12 +114,12 @@ class ViewsTranslatableTest extends ViewsSqlTest {
         'more1' => array('use_more_text'),
         'Reset1' => array('exposed_form', 'reset_button_label'),
         'Offset1' => array('pager', 'expose', 'offset_label'),
-        'Master1' => array('title'),
         'title1' => array('title'),
         'Items per page1' => array('pager', 'expose', 'items_per_page_label'),
         'fieldlabel1' => array('field', 'node', 'nid', 'label'),
         'filterlabel1' => array('filter', 'node', 'nid', 'expose', 'label'),
         '- All -' => array('pager', 'expose', 'items_per_page_options_all_label'),
+        'Header1' => array('header', 'area', 'content'),
       );
 
       foreach ($translatables as $translatable) {
@@ -161,6 +161,14 @@ class ViewsTranslatableTest extends ViewsSqlTest {
     $handler->display->display_options['pager']['options']['expose']['offset_label'] = 'Offset1';
     $handler->display->display_options['style_plugin'] = 'default';
     $handler->display->display_options['row_plugin'] = 'fields';
+    /* Global: Header */
+    $handler->display->display_options['header']['area']['id'] = 'area';
+    $handler->display->display_options['header']['area']['table'] = 'views';
+    $handler->display->display_options['header']['area']['field'] = 'area';
+    $handler->display->display_options['header']['area']['empty'] = FALSE;
+    $handler->display->display_options['header']['area']['content'] = 'Header1';
+    $handler->display->display_options['header']['area']['format'] = 'filtered_html';
+    $handler->display->display_options['header']['area']['tokenize'] = 0;
     /* Field: Content: Nid */
     $handler->display->display_options['fields']['nid']['id'] = 'nid';
     $handler->display->display_options['fields']['nid']['table'] = 'node';