diff --git a/salsa_questionnaire/salsa_questionnaire.module b/salsa_questionnaire/salsa_questionnaire.module
index 5d46661..fa6096d 100644
--- a/salsa_questionnaire/salsa_questionnaire.module
+++ b/salsa_questionnaire/salsa_questionnaire.module
@@ -294,10 +294,10 @@ function salsa_questionnaire_build_question_field(&$form, $question, $responses)
   }
 
   // Add the question to the form inside a container.
-  $form['Questions']['Response_Question_' . $question->questionnaire_question_KEY] = array(
+  $form['Questions'][$question->questionnaire_question_KEY] = array(
     '#type' => 'container',
     '#attributes' => array('class' => array('salsa-question')),
     '#weight' => isset($question->_Order) ? (int)$question->_Order : 0,
-    0 => $element,
+    'Response_Question_' . $question->questionnaire_question_KEY => $element,
   );
 }