expanded choice fields fixed
Merge pull request #1495 from FabianMartin/expanded_choice_fix

expanded choice fields fixed