diff --git a/app/views/phases/_answer_form.html.erb b/app/views/phases/_answer_form.html.erb
index 16c60e0..5b412bf 100644
--- a/app/views/phases/_answer_form.html.erb
+++ b/app/views/phases/_answer_form.html.erb
@@ -57,7 +57,7 @@
 
         <!-- if the question has multiple choices pull out the options -->
         <% if question.option_based? %>
-          <% options = question.options.order("number") %>
+          <% options = question.question_options.order("number") %>
 
           <!-- work through the various format options -->
           <% if q_format.checkbox? %>
@@ -68,7 +68,7 @@
             <ol class="choices-group">
               <% options.each do |op| %>
                 <li class= "choices-group">
-                  <% if answer.option_ids[0] == op.id then%>
+                  <% if answer.question_option_ids[0] == op.id then%>
                     <%= f.radio_button :option_ids, op.id, :checked => true, id: "answer_option_ids_#{op.id}"%> 
                   <%else%>
                     <%= f.radio_button :option_ids, op.id, :checked => false, id: "answer_option_ids_#{op.id}"%>