diff --git a/drupal/sites/all/modules/nodequeue/nodequeue.module b/drupal/sites/all/modules/nodequeue/nodequeue.module
index 5f84cd5..2cc19ce 100644
--- a/drupal/sites/all/modules/nodequeue/nodequeue.module
+++ b/drupal/sites/all/modules/nodequeue/nodequeue.module
@@ -1563,7 +1563,9 @@ function nodequeue_load_nodes($sqid, $backward = FALSE, $from = 0, $count = 5, $
     ->condition('nn.sqid', $sqid)
     ->orderBy('nn.position', $orderby)
     ->addTag('node_access');
-  $query->join('nodequeue_nodes', 'nn', 'n.nid = nn.nid');
+  $query->join('nodequeue_subqueue', 'sq', 'sq.sqid = :sqid', array(':sqid' => $sqid));
+  $query->join('nodequeue_queue', 'q', 'q.qid = sq.qid');
+  $query->join('nodequeue_nodes', 'nn', 'n.nid = nn.nid OR (q.i18n = 1 AND n.tnid = nn.nid)');
 
   if ($published_only) {
     $query->condition('n.status', 1);