diff --git a/includes/base.inc b/includes/base.inc
index b5d09a4..241ee2f 100644
--- a/includes/base.inc
+++ b/includes/base.inc
@@ -328,3 +328,3 @@ class views_object {
       $format = NULL;
-      if (isset($definition['format_key']) && isset($storage[$definition['format_key']])) {
+      if (isset($definition['format_key']) && isset($options[$definition['format_key']])) {
         $format = $options[$definition['format_key']];
diff --git a/tests/views_translatable.test b/tests/views_translatable.test
index 515a33d..9edab45 100644
--- a/tests/views_translatable.test
+++ b/tests/views_translatable.test
@@ -109,3 +109,2 @@ class ViewsTranslatableTest extends ViewsSqlTest {
         'Offset1' => array('pager', 'expose', 'offset_label'),
-        'Master1' => array('title'),
         'title1' => array('title'),
@@ -115,2 +114,3 @@ class ViewsTranslatableTest extends ViewsSqlTest {
         '- All -' => array('pager', 'expose', 'items_per_page_options_all_label'),
+        'Header1' => array('header', 'area', 'content'),
       );
@@ -131,3 +131,3 @@ class ViewsTranslatableTest extends ViewsSqlTest {
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-
+   
     /* Display: Master */
@@ -156,2 +156,10 @@ class ViewsTranslatableTest extends ViewsSqlTest {
     $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 */