Fix MultipleChoice Issues

Fix MultipleChoice Issues