diff --git a/app/controllers/choices_controller.rb b/app/controllers/choices_controller.rb
index 18b948f..3ca9003 100644
--- a/app/controllers/choices_controller.rb
+++ b/app/controllers/choices_controller.rb
@@ -23,7 +23,7 @@ class ChoicesController < InheritedResources::Base
       unless params[:include_inactive]
         @choices = @question.choices(true).active.find(:all, :include => :item)
       else
-        @choices = @question.choices(true)
+        @choices = @question.choices.find(:all, :include =>:item)
       end
     end
     index! do |format|
--
libgit2 0.21.2