fixed questionnaire issue