Multiple choice fix