diff --git a/views/fasttoggle_views_handler_field_node_link.inc b/views/fasttoggle_views_handler_field_node_link.inc
index 5d86c98..7fbc620 100644
--- a/views/fasttoggle_views_handler_field_node_link.inc
+++ b/views/fasttoggle_views_handler_field_node_link.inc
@@ -23,11 +23,11 @@ class fasttoggle_views_handler_field_node_link extends views_handler_field_node_
 
   function render($values) {
     if ($entity = $this->get_value($values)) {
-      return $this->render_link($entity);
+      return $this->render_link($entity, $values);
     }
   }
 
-  function render_link($node) {
+  function render_link($node, $values) {
     if (!node_access('update', $node)) {
       return '';
     }
@@ -38,10 +38,13 @@ class fasttoggle_views_handler_field_node_link extends views_handler_field_node_
     $key = $this->fasttoggle_key;
 
     if (!empty($options[$key])) {
-      $link_info = fasttoggle($options[$key][intval($node->$key)],
-              'node/' . $node->nid . '/toggle/' . $key, FASTTOGGLE_FORMAT_LINK_ARRAY,
-      $key . '_' . $node->nid,
-              'fasttoggle-status-node-' . $node->nid . '-' . $key . '-' . $node->$key);
+      $link_info = fasttoggle(
+        $options[$key][$key]['label'][intval($node->$key)],
+        'node/' . $node->nid . '/toggle/' . $key . '/' . $key,
+        FASTTOGGLE_FORMAT_LINK_ARRAY,
+        $key . '_' . $key . '_' . $node->nid,
+        'fasttoggle-status-node-' . $node->nid . '-' . $key . '-' . $key
+      );
       $this->options['alter']['make_link'] = TRUE;
       $this->options['alter']['path'] = $link_info['href'];
       $this->options['alter']['text'] = $link_info['title'];
@@ -49,7 +52,7 @@ class fasttoggle_views_handler_field_node_link extends views_handler_field_node_
       $this->options['alter']['link_class'] = implode(' ', $link_info['attributes']['class']);
       $this->options['alter']['title'] = $link_info['attributes']['title'];
 
-      $text = $options[$key][intval($node->$key)];
+      $text = $options[$key][$key]['label'][intval($node->$key)];
       return $text;
 
     }