diff --git a/delegator/plugins/tasks/page.inc b/delegator/plugins/tasks/page.inc
index 9e1ff9d2ff76f8cf5b959ffd34210087267d55b3..d40f030d7a652009a77670d6501d49a938c32c3c 100644
--- a/delegator/plugins/tasks/page.inc
+++ b/delegator/plugins/tasks/page.inc
@@ -56,7 +56,11 @@ function delegator_page_delegator_tasks() {
 //      'page callback' => 'delegator_page_execute',
       // context only items
       'handler type' => 'context',
-      'get arguments' => 'delegator_page_get_arguments',
+      'get arguments' => array(
+        'file' => 'page.admin.inc',
+        'path' => drupal_get_path('module', 'delegator') . '/plugins/tasks',
+        'function' => 'delegator_page_get_arguments',
+      ),
       'get context placeholders' => 'delegator_page_get_contexts',
       'access restrictions' => 'delegator_page_access_restrictions',
       'uses handlers' => TRUE,
@@ -333,13 +337,12 @@ function delegator_page_execute($subtask_id) {
  * Return a list of arguments used by this task.
  */
 function delegator_page_get_arguments($task, $subtask_id) {
-  $page = delegator_page_load($subtask_id);
+  $page = delegator_page_get_page_cache($subtask_id);
   return _delegator_page_get_arguments($page);
 }
 
 function _delegator_page_get_arguments($page) {
   $arguments = array();
-
   if (!empty($page->arguments)) {
     foreach ($page->arguments as $keyword => $argument) {
       if (isset($argument['name'])) {
diff --git a/includes/context.inc b/includes/context.inc
index a2b329cb405cb907ac3587de4334d1d37e5d131c..55d7651dec3d6b9c30327b4e9a8267570ed12dd0 100644
--- a/includes/context.inc
+++ b/includes/context.inc
@@ -619,9 +619,10 @@ function ctools_context_id($context, $type = 'context') {
  *   The name being used.
  */
 function ctools_context_next_id($objects, $name) {
+  $id = 0;
   // Figure out which instance of this argument we're creating
   if (!$objects) {
-    return $id;
+    return $id + 1;
   }
 
   foreach ($objects as $object) {
@@ -631,7 +632,8 @@ function ctools_context_next_id($objects, $name) {
       }
     }
   }
-  return $id;
+
+  return $id + 1;
 }