diff --git a/modules/node/views_handler_field_node_path.inc b/modules/node/views_handler_field_node_path.inc
index 5ad3600..2f7ae20 100644
--- a/modules/node/views_handler_field_node_path.inc
+++ b/modules/node/views_handler_field_node_path.inc
@@ -23,6 +23,7 @@ class views_handler_field_node_path extends views_handler_field {
   function construct() {
     parent::construct();
     $this->additional_fields['nid'] = 'nid';
+    $this->additional_fields['language'] = 'language';
   }
 
   function options_form(&$form, &$form_state) {
@@ -52,9 +53,9 @@ class views_handler_field_node_path extends views_handler_field {
     $nid = $this->get_value($values, 'nid');
     $options = array('absolute' => $this->options['absolute']);
     if ($this->options['node_language']) {
-      $node = node_load($nid);
+      $langcode = $this->get_value($values, 'language');
       $languages = language_list();
-      $options['language'] = $languages[$node->language];
+      $options['language'] = $languages[$langcode];
     }
     return url("node/$nid", $options);
   }