diff --git a/node_export.module b/node_export.module
index b5058f7..c8357e9 100755
--- a/node_export.module
+++ b/node_export.module
@@ -258,7 +258,8 @@ function node_export_bulk_operation($nodes = NULL, $format = NULL, $delivery = N
 function node_export_action_info() {
   $actions = array();
   if (user_access('export nodes')) {
-    $selected_formats = variable_get('node_export_format', array('drupal'));
+    $selected_formats = variable_get('node_export_format',
+      array('drupal' => 'drupal'));
     $format_handlers = node_export_format_handlers();
     foreach ($format_handlers as $format_handler => $format) {
       if (!empty($selected_formats[$format_handler])) {
@@ -296,8 +297,12 @@ function node_export_action_info() {
 function node_export_action_form($context, &$form_state, $format = NULL) {
   // Get the name of the vbo views field
   $vbo = _views_bulk_operations_get_field($form_state['build_info']['args'][0]);
+
   // Adjust the selection in case the user chose 'select all'
-  _views_bulk_operations_adjust_selection($form_state['selection'], $form_state['select_all_pages'], $vbo);
+  if (!empty($form_state['select_all_pages'])) {
+    views_bulk_operations_direct_adjust($form_state['selection'], $vbo);
+  }
+
   $nodes = array_combine($form_state['selection'], $form_state['selection']);
   return node_export_bulk_operation($nodes);
 }