Fix bug where navigating away from questionnaire skipped a question.