Bugfix on multiple choice