AnswerController bug fix 505