diff --git a/question_types/quiz_question/quiz_question.pages.inc b/question_types/quiz_question/quiz_question.pages.inc
index f2bec36..42b4f82 100644
--- a/question_types/quiz_question/quiz_question.pages.inc
+++ b/question_types/quiz_question/quiz_question.pages.inc
@@ -220,9 +220,11 @@ function quiz_question_revision_actions_submit($form, &$form_state) {
       }
       else {
         $weight = 1 + db_query('SELECT MAX(weight) FROM {quiz_node_relationship}
-                    WHERE parent_vid = :parent_vid', array())->fetchField();
+          WHERE parent_vid = :parent_vid', array('parent_vid' => $quiz_vid))
+          ->fetchField();
         $quiz_randomization = db_query('SELECT randomization FROM {quiz_node_properties}
-                    WHERE nid = :nid AND vid = :vid', array())->fetchField();
+          WHERE nid = :nid AND vid = :vid', array('nid' => $quiz_nid, 'vid' => $quiz_vid))
+          ->fetchField();
         $question_status = $quiz_randomization == 2 ? QUESTION_RANDOM : QUESTION_ALWAYS;
       }
       // Insert the newest revision of the question into the quiz