Modify the way the multiple choice option is detected...

to solve issue #1