diff --git a/plugins/views_plugin_display.inc b/plugins/views_plugin_display.inc
index 8cabbe9..efd3b55 100644
--- a/plugins/views_plugin_display.inc
+++ b/plugins/views_plugin_display.inc
@@ -58,20 +58,20 @@ class views_plugin_display extends views_plugin {
     // If yes, perform the conversion
     $items_per_page = $this->get_option('items_per_page');
     $offset = $this->get_option('offset');
-    $type = $this->get_option('use_pager');
-    if ((!empty($items_per_page) && $items_per_page != 10) || !empty($offset) || !empty($type)) {
-      if (!$type) {
+    $use_pager = $this->get_option('use_pager');
+    $pager = $this->get_option('pager');
+    if (!empty($pager)) {
+      if (!$use_pager) {
         $type = $items_per_page ? 'some' : 'none';
       }
-
-      if ($type == 1) {
+      else {
         $type = 'full';
       }
 
       $pager = array(
         'type' => $type,
         'options' => array(
-          'offset' => $offset,
+          'offset' => $offset !== NULL ? $offset : 0,
         ),
       );