diff --git a/html/sites/all/modules/contrib/nodequeue/nodequeue.module b/html/sites/all/modules/contrib/nodequeue/nodequeue.module
index f909009..325a1b1 100644
--- a/html/sites/all/modules/contrib/nodequeue/nodequeue.module
+++ b/html/sites/all/modules/contrib/nodequeue/nodequeue.module
@@ -906,6 +906,7 @@ function nodequeue_save(&$queue) {
   );
 
   if (!isset($queue->qid)) {
+    $nodequeue_queue_fields['qid'] = $queue->name;
     $queue->qid = db_insert('nodequeue_queue')
       ->fields($nodequeue_queue_fields)
       ->execute();
@@ -1023,9 +1024,12 @@ function nodequeue_add_subqueue(&$queue, $title, $reference = NULL) {
   $subqueue->title = $title;
 
 
-  $subqueue->sqid = db_insert('nodequeue_subqueue')
+  $subqueue->sqid = $queue->name;
+  
+  db_insert('nodequeue_subqueue')
     ->fields(array(
-      'qid' => $queue->qid,
+      'sqid' => $queue->name,
+      'qid' => $queue->name,
       'reference' => $insert_reference,
       'title' => $title,
     ))