diff --git a/app/serializers/answer_serializer.rb b/app/serializers/answer_serializer.rb
index b06a5ec..227cefc 100644
--- a/app/serializers/answer_serializer.rb
+++ b/app/serializers/answer_serializer.rb
@@ -1,3 +1,4 @@
 class AnswerSerializer < MainSerializer
-  attributes :question_id, :comments_count
+  attributes :question_id, :comments_count, :comments
+  has_many :comments
 end
diff --git a/app/serializers/question_serializer.rb b/app/serializers/question_serializer.rb
index 4053e0b..908ab4b 100644
--- a/app/serializers/question_serializer.rb
+++ b/app/serializers/question_serializer.rb
@@ -2,7 +2,7 @@ class QuestionSerializer < MainSerializer
   attributes :title, :tags, :answers_count, :comments_count, :views
 
   def attributes(*args)
-    class_eval { has_many :answers } if instance_options[:include_answers]
+    class_eval { has_many :comments; has_many :answers } if instance_options[:include_answers]
     super
   end