One/multipleChoice bug fix